[systemd-devel] [PATCH] replace tabs with spaces in some files

2014-02-20 Thread Jason St. John
Files:
* hwdb/60-keyboard.hwdb
* shell-completion/zsh/_systemd-coredumpctl
* src/test/test-helper.h
---
I also noticed that kdbus.h uses tabs exclusively. Is this something that 
should be fixed too?


 hwdb/60-keyboard.hwdb | 4 ++--
 shell-completion/zsh/_systemd-coredumpctl | 4 ++--
 src/test/test-helper.h| 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb
index 9eb460c..edfa842 100644
--- a/hwdb/60-keyboard.hwdb
+++ b/hwdb/60-keyboard.hwdb
@@ -76,7 +76,7 @@ keyboard:dmi:bvn*:bvr*:bd*:svneMachines:pneMachines*E725:pvr*
 
 # Acer platform kernel driver
 keyboard:name:Acer WMI hotkeys:dmi:bvn*:bvr*:bd*:svn*:pnAcer*:pvr*
- KEYBOARD_KEY_82=f21   # Touchpad toggle
+ KEYBOARD_KEY_82=f21# Touchpad toggle
 
 # Aspire models
 keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnAspire*:pvr*
@@ -138,7 +138,7 @@ keyboard:dmi:bvn*:bvr*:bd*:svnASUS:pn*
  KEYBOARD_KEY_ef=mute
 
 keyboard:name:Asus WMI hotkeys:dmi:bvn*:bvr*:bd*:svnASUS*:pn*:pvr*
- KEYBOARD_KEY_6b=f21   # Touchpad Toggle
+ KEYBOARD_KEY_6b=f21# Touchpad Toggle
 
 ###
 # BenQ
diff --git a/shell-completion/zsh/_systemd-coredumpctl 
b/shell-completion/zsh/_systemd-coredumpctl
index 159e8ee..94b1e92 100644
--- a/shell-completion/zsh/_systemd-coredumpctl
+++ b/shell-completion/zsh/_systemd-coredumpctl
@@ -14,8 +14,8 @@ _systemd-coredumpctl_command(){
 local -a _dumps
 cmd=${${_systemd_coredumpctl_cmds[(r)$words[1]:*]%%:*}}
 if (( $#cmd  )); then
-   # user can set zstyle 
':completion:*:*:systemd-coredumpctl:*' sort no for coredumps to be ordered by 
date, otherwise they get ordered by pid
-   _dumps=( ${(foa)$(systemd-coredumpctl list | awk 
'BEGIN{OFS=:} /^\s/ {sub(/[[ \t]+/, ); print $5,$0}' 2/dev/null)} )
+# user can set zstyle ':completion:*:*:systemd-coredumpctl:*' sort 
no for coredumps to be ordered by date, otherwise they get ordered by pid
+_dumps=( ${(foa)$(systemd-coredumpctl list | awk 'BEGIN{OFS=:} 
/^\s/ {sub(/[[ \t]+/, ); print $5,$0}' 2/dev/null)} )
 if [[ -n $_dumps ]]; then
 _describe -t pids 'coredumps' _dumps
 else
diff --git a/src/test/test-helper.h b/src/test/test-helper.h
index 92864ed..f75dd33 100644
--- a/src/test/test-helper.h
+++ b/src/test/test-helper.h
@@ -24,8 +24,8 @@
 #include sd-daemon.h
 
 #define TEST_REQ_RUNNING_SYSTEMD(x) \
-   if (sd_booted()  0) {  \
-   x;  \
+if (sd_booted()  0) {  \
+x;  \
 } else {\
 printf(systemd not booted skipping '%s'\n, #x);   \
 }
-- 
1.9.0

___
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel


Re: [systemd-devel] [PATCH] replace tabs with spaces in some files

2014-02-20 Thread Greg KH
On Thu, Feb 20, 2014 at 06:09:27PM -0500, Jason St. John wrote:
 Files:
 * hwdb/60-keyboard.hwdb
 * shell-completion/zsh/_systemd-coredumpctl
 * src/test/test-helper.h
 ---
 I also noticed that kdbus.h uses tabs exclusively. Is this something that 
 should be fixed too?

kdbus.h will end up in the kernel source tree, so it needs to keep tabs
to align with that project's coding convention.
___
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel


Re: [systemd-devel] [PATCH] replace tabs with spaces in some files

2014-02-20 Thread Lennart Poettering
On Thu, 20.02.14 18:09, Jason St. John (jstj...@purdue.edu) wrote:

Applied! Thanks!

 I also noticed that kdbus.h uses tabs exclusively. Is this something that 
 should be fixed too?

Greg's right, this should not be fixed. kdbus.h and a couple of drop-in
headers we copied from other projects should always stay in the original
state so that we can easily sync and diff them from/to upstream.

Thanks!

Lennart

-- 
Lennart Poettering, Red Hat
___
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel