replace tabs with spaces in various files

The affected files in this patch had inconsistent use of tabs vs. spaces
for indentation, and this patch eliminates the stray tabs.

Also, the opening brace of sigchld_hdl() in activate.c was moved so the
opening braces are consistent throughout the file.

diff --git a/NEWS b/NEWS
index 6cfe0dfc59f5fcc64930046647dade7efaa54dbd..1b3bc2b65b805b75c5999520d568646b96f265aa 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1798,7 +1798,7 @@ CHANGES WITH 41:
           understood to set system wide environment variables
           dynamically at boot.
 
           understood to set system wide environment variables
           dynamically at boot.
 

-       * We now limit the set of capabilities of systemd-journald.
+        * We now limit the set of capabilities of systemd-journald.

 
         * We now set SIGPIPE to ignore by default, since it only is
           useful in shell pipelines, and has little use in general
 
         * We now set SIGPIPE to ignore by default, since it only is
           useful in shell pipelines, and has little use in general

diff --git a/m4/attributes.m4 b/m4/attributes.m4
index f0bcf2421190af6d2a80529f45f1d9068bafaa42..7e080da65d91992ac6b6b68f29dc8773595073c7 100644 (file)
--- a/m4/attributes.m4
+++ b/m4/attributes.m4
@@ -40,12 +40,12 @@ dnl CC_CHECK_FLAG_APPEND([WHERE-TO-APPEND], [ENV-VAR], [FLAG])
 AC_DEFUN([CC_CHECK_FLAG_APPEND], [
   AC_CACHE_CHECK([if $CC supports flag $3 in envvar $2],
                  AS_TR_SH([cc_cv_$2_$3]),
 AC_DEFUN([CC_CHECK_FLAG_APPEND], [
   AC_CACHE_CHECK([if $CC supports flag $3 in envvar $2],
                  AS_TR_SH([cc_cv_$2_$3]),

-                [eval "AS_TR_SH([cc_save_$2])='${$2}'"
-                 eval "AS_TR_SH([$2])='-Werror $3'"
-                 AC_COMPILE_IFELSE([AC_LANG_SOURCE([int a = 0; int main(void) { return a; } ])],
+          [eval "AS_TR_SH([cc_save_$2])='${$2}'"
+           eval "AS_TR_SH([$2])='-Werror $3'"
+           AC_COMPILE_IFELSE([AC_LANG_SOURCE([int a = 0; int main(void) { return a; } ])],

                                     [eval "AS_TR_SH([cc_cv_$2_$3])='yes'"],
                                     [eval "AS_TR_SH([cc_cv_$2_$3])='no'"])
                                     [eval "AS_TR_SH([cc_cv_$2_$3])='yes'"],
                                     [eval "AS_TR_SH([cc_cv_$2_$3])='no'"])

-                 eval "AS_TR_SH([$2])='$cc_save_$2'"])
+           eval "AS_TR_SH([$2])='$cc_save_$2'"])

 
   AS_IF([eval test x$]AS_TR_SH([cc_cv_$2_$3])[ = xyes],
         [eval "$1='${$1} $3'"])
 
   AS_IF([eval test x$]AS_TR_SH([cc_cv_$2_$3])[ = xyes],
         [eval "$1='${$1} $3'"])


@@ -92,10 +92,10 @@ AC_DEFUN([CC_NOUNDEFINED], [
         dnl for a much more readable commandline, so that people can understand what
         dnl it does without going to look for what the heck -z defs does.
         for possible_flags in "-Wl,--no-undefined" "-Wl,-z,defs"; do
         dnl for a much more readable commandline, so that people can understand what
         dnl it does without going to look for what the heck -z defs does.
         for possible_flags in "-Wl,--no-undefined" "-Wl,-z,defs"; do

-          CC_CHECK_LDFLAGS([$possible_flags], [LDFLAGS_NOUNDEFINED="$possible_flags"])
-         break
+           CC_CHECK_LDFLAGS([$possible_flags], [LDFLAGS_NOUNDEFINED="$possible_flags"])
+           break

         done
         done

-       ;;
+     ;;

   esac
 
   AC_SUBST([LDFLAGS_NOUNDEFINED])
   esac
 
   AC_SUBST([LDFLAGS_NOUNDEFINED])


@@ -231,8 +231,8 @@ AC_DEFUN([CC_FLAG_VISIBILITY], [
     [cc_flag_visibility_save_CFLAGS="$CFLAGS"
      CFLAGS="$CFLAGS $cc_cv_werror"
      CC_CHECK_CFLAGS_SILENT([-fvisibility=hidden],
     [cc_flag_visibility_save_CFLAGS="$CFLAGS"
      CFLAGS="$CFLAGS $cc_cv_werror"
      CC_CHECK_CFLAGS_SILENT([-fvisibility=hidden],

-       cc_cv_flag_visibility='yes',
-       cc_cv_flag_visibility='no')
+     cc_cv_flag_visibility='yes',
+     cc_cv_flag_visibility='no')

      CFLAGS="$cc_flag_visibility_save_CFLAGS"])
 
   AS_IF([test "x$cc_cv_flag_visibility" = "xyes"],
      CFLAGS="$cc_flag_visibility_save_CFLAGS"])
 
   AS_IF([test "x$cc_cv_flag_visibility" = "xyes"],


@@ -252,7 +252,7 @@ AC_DEFUN([CC_FUNC_EXPECT], [
        [int some_function() {
         int a = 3;
         return (int)__builtin_expect(a, 3);
        [int some_function() {
         int a = 3;
         return (int)__builtin_expect(a, 3);

-       }])],
+     }])],

        [cc_cv_func_expect=yes],
        [cc_cv_func_expect=no])
      CFLAGS="$ac_save_CFLAGS"
        [cc_cv_func_expect=yes],
        [cc_cv_func_expect=no])
      CFLAGS="$ac_save_CFLAGS"

diff --git a/man/systemd-coredumpctl.xml b/man/systemd-coredumpctl.xml
index 02b688606cdc806e5d381268875f4db78bb62b1c..9ccb67d12d9afe0c30b1d79d303dcc26e4ddf7b6 100644 (file)
--- a/man/systemd-coredumpctl.xml
+++ b/man/systemd-coredumpctl.xml
@@ -202,8 +202,8 @@
                 <title>Exit status</title>
                 <para>On success 0 is returned, a non-zero failure
                 code otherwise. Not finding any matching coredumps is treated
                 <title>Exit status</title>
                 <para>On success 0 is returned, a non-zero failure
                 code otherwise. Not finding any matching coredumps is treated

-               as failure.
-               </para>
+                as failure.
+                </para>

         </refsect1>
 
         <refsect1>
         </refsect1>
 
         <refsect1>

diff --git a/src/activate/activate.c b/src/activate/activate.c
index 87526d47cc8e5babdbb37873f6f83846f0fe4052..83d25b13af9063e4c875c95e51b48c4e160644fd 100644 (file)
--- a/src/activate/activate.c
+++ b/src/activate/activate.c
@@ -290,16 +290,15 @@ static int do_accept(const char* name, char **argv, char **envp, int fd) {
 }
 
 /* SIGCHLD handler. */
 }
 
 /* SIGCHLD handler. */

-static void sigchld_hdl(int sig, siginfo_t *t, void *data)
-{
+static void sigchld_hdl(int sig, siginfo_t *t, void *data) {

         log_info("Child %d died with code %d", t->si_pid, t->si_status);
         log_info("Child %d died with code %d", t->si_pid, t->si_status);

-       /* Wait for a dead child. */
-       waitpid(t->si_pid, NULL, 0);
+        /* Wait for a dead child. */
+        waitpid(t->si_pid, NULL, 0);

 }
 
 static int install_chld_handler(void) {
         int r;
 }
 
 static int install_chld_handler(void) {
         int r;

-       struct sigaction act;
+        struct sigaction act;

         zero(act);
         act.sa_flags = SA_SIGINFO;
         act.sa_sigaction = sigchld_hdl;
         zero(act);
         act.sa_flags = SA_SIGINFO;
         act.sa_sigaction = sigchld_hdl;

diff --git a/src/core/execute.c b/src/core/execute.c
index 5e342f8d47af71fdf1afb3faeb7a38eb9c5d69b5..cbeb0caf262967f58189bcdcf11938b1d5707772 100644 (file)
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -1727,10 +1727,10 @@ int exec_context_load_environment(const ExecContext *c, char ***l) {
 
                                 strv_free(r);
                                 return k;
 
                                 strv_free(r);
                                 return k;

-                         }
+                        }

                         /* Log invalid environment variables with filename */
                         /* Log invalid environment variables with filename */

-                       if (p)
-                               p = strv_env_clean_log(p, pglob.gl_pathv[n]);
+                        if (p)
+                                p = strv_env_clean_log(p, pglob.gl_pathv[n]);

 
                         if (r == NULL)
                                 r = p;
 
                         if (r == NULL)
                                 r = p;

diff --git a/src/shared/missing.h b/src/shared/missing.h
index 96e6d63101cb0161622b604d3fc53c466e17163d..24a8392b222ce4d45f37a10c2c7cc7b046d87efa 100644 (file)
--- a/src/shared/missing.h
+++ b/src/shared/missing.h
@@ -139,7 +139,7 @@ static inline int fanotify_init(unsigned int flags, unsigned int event_f_flags)
 static inline int fanotify_mark(int fanotify_fd, unsigned int flags, uint64_t mask,
                                 int dfd, const char *pathname) {
 #if defined _MIPS_SIM && _MIPS_SIM == _MIPS_SIM_ABI32 || defined __powerpc__ && !defined __powerpc64__ \
 static inline int fanotify_mark(int fanotify_fd, unsigned int flags, uint64_t mask,
                                 int dfd, const char *pathname) {
 #if defined _MIPS_SIM && _MIPS_SIM == _MIPS_SIM_ABI32 || defined __powerpc__ && !defined __powerpc64__ \

-       || defined __arm__ && !defined __aarch64__
+    || defined __arm__ && !defined __aarch64__

         union {
                 uint64_t _64;
                 uint32_t _32[2];
         union {
                 uint64_t _64;
                 uint32_t _32[2];

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 7ecd8d2cfbe918bd872e3351f0339d266f0fc1e5..7436d4e87537a6bb3f55594f0979476835fd6551 100644 (file)
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -3444,7 +3444,7 @@ static int show_one(const char *verb, DBusConnection *bus, const char *path, boo
                         r = 1;
                 else
                         r = 3;
                         r = 1;
                 else
                         r = 3;

-       }
+        }

 
         while ((p = info.exec)) {
                 LIST_REMOVE(ExecStatusInfo, exec, info.exec, p);
 
         while ((p = info.exec)) {
                 LIST_REMOVE(ExecStatusInfo, exec, info.exec, p);