ident-cleanup-20030619

FIXES 1549

change to /* */ comment style

====================
This delta was composed from multiple commits as part of the CVS->Git migration.
The checkin message with each commit was inconsistent.
The following are the additional commit messages.
====================
FIXES 1548

i think indent is being stupid, but whatever.

====================
FIXES 1545

get rid of macro usage with causes "spurious" else

====================
FIXES 1544

comment in ifdef'd out code should be a comment

====================
FIXES 1543

make definitions ifdef notdef'd look like definitions

diff --git a/src/WINNT/afssvrcfg/afscfg.h b/src/WINNT/afssvrcfg/afscfg.h
index 4f6842f..c94f084 100644 (file)
--- a/src/WINNT/afssvrcfg/afscfg.h
+++ b/src/WINNT/afssvrcfg/afscfg.h
@@ -30,7 +30,7 @@ extern "C" {
 #define        LOG_FILE_NAME   "afs_server_config_log.txt"
 
 
-// Enum for the steps in the wizard.  Used to index into the array of steps.
+/* Enum for the steps in the wizard.  Used to index into the array of steps. */
 enum StateID {
    sidSTEP_ONE,
    sidSTEP_TWO,

diff --git a/src/budb/procs.c b/src/budb/procs.c
index adce63e..4691ee1 100644 (file)
--- a/src/budb/procs.c
+++ b/src/budb/procs.c
@@ -2426,11 +2426,14 @@ afs_int32 GetDumps (call, majorVersion, flags, name, start, end,
            if (eval) ABORT(eval);
        }
 
+/*
        if nothing found
                return error
 
        from saved volfragment address, compute dump.
        otherwise, return dump found
+*/
+
 #endif /* PA */
        
     }

diff --git a/src/comerr/compile_et.c b/src/comerr/compile_et.c
index 6f869b9..80d8e90 100644 (file)
--- a/src/comerr/compile_et.c
+++ b/src/comerr/compile_et.c
@@ -188,7 +188,8 @@ int main (int argc, char **argv)
                    usage ();
                if (language)
                    dup_err ("languanges", language_names[(int)language], arg);
-#define check_lang(x,v) else if (!strcasecmp(arg,x)) language = v
+
+#define check_lang(x,v) if (!strcasecmp(arg,x)) language = v
                check_lang ("c", lang_C);
                check_lang ("ansi_c", lang_C);
                check_lang ("ansi-c", lang_C);
@@ -201,7 +202,9 @@ int main (int argc, char **argv)
                check_lang ("cplusplus", lang_CPP);
                check_lang ("c-plus-plus", lang_CPP);
 #undef check_lang
-               else {
+
+               if (!language)
+               {
                    fprintf (stderr, "%s: unknown language name `%s'\n",
                             whoami, arg);
                    fprintf (stderr, "\tpick one of: C K&R-C\n");

diff --git a/src/rx/rx_packet.h b/src/rx/rx_packet.h
index 8f1546c..9b4061d 100644 (file)
--- a/src/rx/rx_packet.h
+++ b/src/rx/rx_packet.h
@@ -82,17 +82,17 @@
 
 /* * * * these are the old defines
 */
- define        RX_MAX_PACKET_SIZE      (RX_MAX_DL_MTU -RX_IPUDP_SIZE)
+#define        RX_MAX_PACKET_SIZE      (RX_MAX_DL_MTU -RX_IPUDP_SIZE)
 
- define        RX_MAX_PACKET_DATA_SIZE (RX_MAX_PACKET_SIZE-RX_HEADER_SIZE)
- ifdef AFS_HPUX_ENV
+#define        RX_MAX_PACKET_DATA_SIZE (RX_MAX_PACKET_SIZE-RX_HEADER_SIZE)
+#ifdef AFS_HPUX_ENV
 /* HPUX by default uses an 802.3 size, and it's not evident from SIOCGIFCONF */
- define        RX_LOCAL_PACKET_SIZE    (1492 - RX_IPUDP_SIZE)   
- define        RX_REMOTE_PACKET_SIZE   (1492 - RX_IPUDP_SIZE)   
- else
- define        RX_LOCAL_PACKET_SIZE    RX_MAX_PACKET_SIZE  /* For hosts on same net */
- define        RX_REMOTE_PACKET_SIZE   RX_MAX_PACKET_SIZE  /* see note above */
- endif
+#define        RX_LOCAL_PACKET_SIZE    (1492 - RX_IPUDP_SIZE)   
+#define        RX_REMOTE_PACKET_SIZE   (1492 - RX_IPUDP_SIZE)   
+#else
+#define        RX_LOCAL_PACKET_SIZE    RX_MAX_PACKET_SIZE  /* For hosts on same net */
+#define        RX_REMOTE_PACKET_SIZE   RX_MAX_PACKET_SIZE  /* see note above */
+#endif
 #endif /* notdef */
 
 /* These are the new, streamlined ones.

diff --git a/src/vfsck/setup.c b/src/vfsck/setup.c
index a7f30c7..ac3519a 100644 (file)
--- a/src/vfsck/setup.c
+++ b/src/vfsck/setup.c
@@ -285,7 +285,7 @@ restat:
        setup_all_block_seek();
 #endif
 #ifdef AFS_SUN5_ENV
-       else if (debug)
+       if (!preen && debug)
                printf(" pid %d\n", getpid());
        if (debug && (hotroot || mountedfs)) {
                printf("** %s", sname);