curly wars / auto-indentation

[oweals/gnunet.git] / src / util / getopt.c

diff --git a/src/util/getopt.c b/src/util/getopt.c
index db81d1c3d76b6eb004082d3caec29be8d3872129..317bc074826aa8f0830789cea3ae76bed5092122 100644 (file)
--- a/src/util/getopt.c
+++ b/src/util/getopt.c
@@ -49,6 +49,10 @@ Copyright (C) 2006 Christian Grothoff
 #endif
 #endif
 
+#define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__)
+
+#define LOG_STRERROR(kind,syscall) GNUNET_log_from_strerror (kind, "util", syscall)
+
 #if defined (WIN32) && !defined (__CYGWIN32__)
 /* It's not Unix, really.  See?  Capital letters.  */
 #include <windows.h>
@@ -194,7 +198,8 @@ static char *posixly_correct;
 /* Avoid depending on library functions or files
    whose names are inconsistent.  */
 
-char *getenv ();
+char *
+getenv ();
 
 static char *
 my_index (str, chr)
@@ -218,7 +223,8 @@ my_index (str, chr)
 #if !defined (__STDC__) || !__STDC__
 /* gcc with -traditional declares the built-in strlen to return int,
    and has done so at least since version 2.4.5. -- rms.  */
-extern int strlen (const char *);
+extern int
+strlen (const char *);
 #endif /* not __STDC__ */
 #endif /* __GNUC__ */
 
@@ -283,7 +289,8 @@ text_set_element (__libc_subinit, store_args_and_env);
    the new indices of the non-options in ARGV after they are moved.  */
 
 #if defined (__STDC__) && __STDC__
-static void exchange (char **);
+static void
+exchange (char **);
 #endif
 
 static void
@@ -370,7 +377,8 @@ exchange (argv)
 /* Initialize the internal data when the first call is made.  */
 
 #if defined (__STDC__) && __STDC__
-static const char *_getopt_initialize (int, char *const *, const char *);
+static const char *
+_getopt_initialize (int, char *const *, const char *);
 #endif
 static const char *
 _getopt_initialize (argc, argv, optstring)
@@ -605,16 +613,16 @@ GN_getopt_internal (int argc, char *const *argv, const char *optstring,
   /* Decode the current option-ARGV-element.  */
 
   /* Check whether the ARGV-element is a long option.
-   * 
+   *
    * If long_only and the ARGV-element has the form "-f", where f is
    * a valid short option, don't consider it an abbreviated form of
    * a long option that starts with f.  Otherwise there would be no
    * way to give the -f short option.
-   * 
+   *
    * On the other hand, if there's a long option "fubar" and
    * the ARGV-element is "-fu", do consider that an abbreviation of
    * the long option, just like "--fu", and not "-f" with arg "u".
-   * 
+   *
    * This distinction seems to be the most useful approach.  */
 
   if (longopts != NULL &&