From b008274afdbe375b32a7e66dbd073e200f6f0587 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Fri, 4 Feb 2011 12:57:53 +0100
Subject: Nuked almost all trailing white space.

We better do this once and for all instead of cluttering all future
commits with diffs of trailing white spaces.  In the majority of cases
blank or single lines are affected and thus this change won't disturb
a git blame too much.  For future commits the pre-commit scripts
checks that this won't happen again.
---
 tools/symcryptrun.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'tools/symcryptrun.c')

diff --git a/tools/symcryptrun.c b/tools/symcryptrun.c
index 438ed459c..1d882a1d5 100644
--- a/tools/symcryptrun.c
+++ b/tools/symcryptrun.c
@@ -152,9 +152,9 @@ static ARGPARSE_OPTS opts[] =
 
     { oDecrypt, "decrypt", 0, N_("decryption modus") },
     { oEncrypt, "encrypt", 0, N_("encryption modus") },
-    
+
     { 302, NULL, 0, N_("@\nOptions:\n ") },
-    
+
     { oClass, "class", 2, N_("tool class (confucius)") },
     { oProgram, "program", 2, N_("program filename") },
 
@@ -167,7 +167,7 @@ static ARGPARSE_OPTS opts[] =
 
     /* Hidden options.  */
     { oNoVerbose, "no-verbose",  0, "@" },
-    { oHomedir, "homedir", 2, "@" },   
+    { oHomedir, "homedir", 2, "@" },
     { oNoOptions, "no-options", 0, "@" },/* shortcut for --options /dev/null */
 
     {0}
@@ -253,10 +253,10 @@ remove_file (char *name, int shred)
       if (pid == 0)
 	{
 	  /* Child.  */
-	  
+
 	  /* -f forces file to be writable, and -u unlinks it afterwards.  */
 	  char *args[] = { SHRED, "-uf", name, NULL };
-	  
+
 	  execv (SHRED, args);
 	  _exit (127);
 	}
@@ -268,11 +268,11 @@ remove_file (char *name, int shred)
       else
 	{
 	  /* Parent.  */
-	  
+
 	  if (TEMP_FAILURE_RETRY (waitpid (pid, &status, 0)) != pid)
 	    status = -1;
 	}
-      
+
       if (!WIFEXITED (status))
 	{
 	  log_error (_("%s on %s aborted with status %i\n"),
@@ -433,7 +433,7 @@ confucius_get_pass (const char *cacheid, int again, int *canceled)
 
   if (canceled)
     *canceled = 0;
-  
+
   orig_codeset = i18n_switchto_utf8 ();
   pw = simple_pwquery (cacheid,
                        again ? _("does not match - try again"):NULL,
@@ -451,7 +451,7 @@ confucius_get_pass (const char *cacheid, int again, int *canceled)
 	  log_info (_("cancelled\n"));
 	  if (canceled)
 	    *canceled = 1;
-	}      
+	}
     }
 
   return pw;
@@ -560,7 +560,7 @@ confucius_process (int mode, char *infile, char *outfile,
       free (args);
       return 1;
     }
-  else if (pid == 0) 
+  else if (pid == 0)
     {
       /* Child.  */
 
@@ -633,7 +633,7 @@ confucius_process (int mode, char *infile, char *outfile,
 		  close (cstderr[0]);
 		  return 1;
 		}
-	      else  
+	      else
 		{
 		  char *newline;
 
@@ -859,7 +859,7 @@ confucius_main (int mode, int argc, char *argv[])
       rmdir (tmpdir);
       return res;
     }
-  
+
   remove_file (outfile, mode == oDecrypt);
   if (infile_from_stdin)
     remove_file (infile, mode == oEncrypt);
@@ -879,7 +879,7 @@ main (int argc, char **argv)
   char **orig_argv;
   FILE *configfp = NULL;
   char *configname = NULL;
-  unsigned configlineno; 
+  unsigned configlineno;
   int mode = 0;
   int res;
   char *logfile = NULL;
@@ -916,7 +916,7 @@ main (int argc, char **argv)
 
   if (default_config)
     configname = make_filename (opt.homedir, "symcryptrun.conf", NULL );
-  
+
   argc = orig_argc;
   argv = orig_argv;
   pargs.argc = &argc;
@@ -935,7 +935,7 @@ main (int argc, char **argv)
                          configname, strerror(errno) );
               exit(1);
 	    }
-          xfree (configname); 
+          xfree (configname);
           configname = NULL;
 	}
       default_config = 0;
@@ -952,7 +952,7 @@ main (int argc, char **argv)
 	case oQuiet:     opt.quiet = 1; break;
         case oVerbose:   opt.verbose++; break;
         case oNoVerbose: opt.verbose = 0; break;
-	  
+
 	case oClass:	opt.class = pargs.r.ret_str; break;
 	case oProgram:	opt.program = pargs.r.ret_str; break;
 	case oKeyfile:	opt.keyfile = pargs.r.ret_str; break;
-- 
cgit v1.2.3