CRASHREPORT cleanup

make deprecation warning suppression unconditional
formatting/whitespace

src/end.c

@@ -224,10 +224,12 @@ NH_abort(char *why)
 
 #ifdef CRASHREPORT
 # include <fcntl.h>
+# define HASH_PRAGMA_START \
+    _Pragma("GCC diagnostic push"); \
+    _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
+# define HASH_PRAGMA_END   _Pragma("GCC diagnostic pop");
 # ifdef MACOS
 #  include <CommonCrypto/CommonDigest.h>
-#  define HASH_PRAGMA_START
-#  define HASH_PRAGMA_END
 #  define HASH_CONTEXT CC_MD4_CTX
 #  define HASH_INIT(ctx) CC_MD4_Init(ctx)
 #  define HASH_UPDATE(ctx, ptr, len) CC_MD4_Update(ctx, ptr, len)
@@ -236,16 +238,11 @@ NH_abort(char *why)
 # endif
 # ifdef __linux__
 #  include <openssl/md4.h>
-#  define HASH_PRAGMA_START \
-	_Pragma("GCC diagnostic push"); \
-	_Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
-#  define HASH_PRAGMA_END   _Pragma("GCC diagnostic pop");
 #  define HASH_CONTEXT MD4_CTX
 #  define HASH_INIT(ctx) MD4_Init(ctx)
 #  define HASH_UPDATE(ctx, ptr, len) MD4_Update(ctx, ptr, len)
 #  define HASH_FINISH(ctx, out) MD4_Final(out, ctx)
 #  define HASH_RESULT_SIZE MD4_DIGEST_LENGTH
-
 # endif
 // Binary ID - Use only as a hint to contact.html for recognizing our own
 // binaries.  This is easily spoofed!
@@ -260,7 +257,7 @@ crashreport_init(int argc UNUSED, char *argv[] UNUSED){
     HASH_INIT(&ctx);
 #ifdef MACOS
     char *binfile = argv[0];
-    if(!binfile || !*binfile){
+    if (!binfile || !*binfile) {
 # ifdef BETA
                 // If this triggers, investigate CFBundleGetMainBundle
                 // or CFBundleCopyExecutableURL.
@@ -272,14 +269,14 @@ crashreport_init(int argc UNUSED, char *argv[] UNUSED){
 #ifdef __linux__
     char binfile[PATH_MAX+1];
     int len = readlink("/proc/self/exe", binfile, sizeof(binfile)-1);
-    if(len>0) {
+    if (len>0) {
         binfile[len] = '\0';
     } else {
         goto skip;
     }
 #endif
     int fd = open(binfile, O_RDONLY, 0);
-    if(fd == -1) {
+    if (fd == -1) {
 # ifdef BETA
         raw_printf("open e=%s",strerror(errno));
 # endif
@@ -287,7 +284,7 @@ crashreport_init(int argc UNUSED, char *argv[] UNUSED){
     }
     int segsize;
     char segment[4096];
-    while(0 < (segsize = read(fd, segment,sizeof(segment)))){
+    while (0 < (segsize = read(fd, segment,sizeof(segment)))) {
         HASH_UPDATE(&ctx, segment, segsize);
     }
     HASH_FINISH(&ctx, tmp);
@@ -296,7 +293,7 @@ crashreport_init(int argc UNUSED, char *argv[] UNUSED){
     char *p = bid;
     unsigned char *in = &tmp[0];
     char cnt=HASH_RESULT_SIZE;
-    while(cnt--){
+    while (cnt--) {
         p += snprintf(p, HASH_RESULT_SIZE-(p-bid), "%02x",*(in++));
     }
     *p = '\0';
@@ -320,7 +317,7 @@ crashreport_bidshow(void){
 
 boolean
 submit_web_report(const char *msg, char *why){
-    if(sysopt.crashreporturl){
+    if (sysopt.crashreporturl) {
         const char *xargv[SWR_LINES];
         char version[100];
         char versionstring[200];        // used twice as a temp
@@ -353,17 +350,17 @@ submit_web_report(const char *msg, char *why){
 // XXX header for wholetrace - what other info do we want?
 // NB: prelines not tested against size of SWR_FRAMES.
 #define SWR_HDR(line) \
-  if(endp<&wholetrace[sizeof(wholetrace)]){ \
+  if (endp<&wholetrace[sizeof(wholetrace)]) { \
     endp+=snprintf(endp, sizeof(wholetrace)-(endp-wholetrace), "%s\n",line); \
     prelines++; \
   }
 #define SWR_HDRnonl(line) \
-  if(endp<&wholetrace[sizeof(wholetrace)]){ \
+  if (endp<&wholetrace[sizeof(wholetrace)]) { \
     endp+=snprintf(endp, sizeof(wholetrace)-(endp-wholetrace), "%s",line); \
   }
         char *endp = wholetrace;
         wholetrace[0] = 0;
-	if(why){
+        if (why) {
             SWR_HDR(why);
         }
 
@@ -396,7 +393,7 @@ submit_web_report(const char *msg, char *why){
         xargv[xargc++] = 0; // terminate array
 
         pid = fork();
-	if( pid == 0 ){
+        if (pid == 0) {
             execve(CRASHREPORT, (char * const *)xargv, environ);
             char err[100];
             sprintf(err, "Can't start " CRASHREPORT ": %s", strerror(errno));
@@ -406,9 +403,9 @@ submit_web_report(const char *msg, char *why){
             errno=0;
                     // XXX do we _really_ know this is the right pid?
             (void)waitpid(pid, &status, 0);
-	    if(status){	// XXX check could be more precise
+            if (status) {         // XXX check could be more precise
 #if 0
-// Not useful at the moment. XXX
+                    // Not useful at the moment. XXX
                 char err[100];
                 sprintf(err, "pid=%d e=%d status=%0x",wpid,errno,status);
                 raw_print(err);
@@ -421,7 +418,7 @@ submit_web_report(const char *msg, char *why){
     }
     return FALSE;
 }
-#endif	// CRASHREPORT
+#endif  /* CRASHREPORT */
 #undef SWR_ADD
 #undef SWR_FRAMES
 #undef SWR_HDR