basic preprocessor formatting improvements (#7030)

badasahog · web-flow · commit ef195e931967 · 2025-05-27T09:24:26.000-07:00
diff --git a/src/assign.c b/src/assign.c
@@ -1335,4 +1335,3 @@ SEXP setcharvec(SEXP x, SEXP which, SEXP newx)
   }
   return R_NilValue;
 }
-
diff --git a/src/chmatch.c b/src/chmatch.c
@@ -169,4 +169,3 @@ system.time(ans2 <- .Call("Cchmatch2", x,y,0L))     # 0.17sec  as of 1.12.0 and
 system.time(ans3 <- chmatchdup(x,y,0L))             # 0.09sec  from 1.12.2; but goal wasn't speed rather simplified code; e.g. rbindlist.c down from 960 to 360 lines
 identical(ans2,ans3)  # test 2000
 */
-
diff --git a/src/cj.c b/src/cj.c
@@ -99,4 +99,3 @@ SEXP cj(SEXP base_list) {
   UNPROTECT(1);
   return out;
 }
-
diff --git a/src/coalesce.c b/src/coalesce.c
@@ -172,4 +172,3 @@ SEXP coalesce(SEXP x, SEXP inplaceArg) {
   UNPROTECT(nprotect);
   return first;
 }
-
diff --git a/src/data.table.h b/src/data.table.h
@@ -356,4 +356,3 @@ SEXP dt_has_zlib(void);
 SEXP startsWithAny(SEXP, SEXP, SEXP);
 SEXP convertDate(SEXP, SEXP);
 SEXP fastmean(SEXP);
-
diff --git a/src/fastmean.c b/src/fastmean.c
@@ -134,4 +134,3 @@ SEXP fastmean(SEXP args)
       COMPLEX(ans)[0].i = (double) si;
       break;
 */
-
diff --git a/src/fsort.c b/src/fsort.c
@@ -347,4 +347,3 @@ SEXP fsort(SEXP x, SEXP verboseArg) {
   UNPROTECT(nprotect);
   return(ansVec);
 }
-
diff --git a/src/fwrite.h b/src/fwrite.h
@@ -120,4 +120,3 @@ typedef struct fwriteMainArgs
 } fwriteMainArgs;
 
 void fwriteMain(fwriteMainArgs args);
-
diff --git a/src/fwriteLookups.h b/src/fwriteLookups.h
@@ -2137,6 +2137,3 @@ const int monthday[366] =
 1221,1222,1223,1224,1225,1226,1227,1228,1229,1230,1231,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,
 116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,201,202,203,204,205,206,207,208,209,210,211,212,213,
 214,215,216,217,218,219,220,221,222,223,224,225,226,227,228 };
-
-
-
diff --git a/src/gsumm.c b/src/gsumm.c
@@ -839,7 +839,8 @@ static SEXP gminmax(SEXP x, SEXP narm, const bool min)
             ansd[thisgrp] = elem;
         }
       }
-    }}
+    }
+  }
     break;
   case CPLXSXP:
     error(_("Type 'complex' has no well-defined min/max"));
@@ -972,7 +973,7 @@ static SEXP gfirstlast(SEXP x, const bool first, const int w, const bool headw)
     } else {                                                                                       \
       /* w>1 && !first not supported because -i in R means everything-but-i and gnthvalue */       \
       /* currently takes n>0 only. However, we could still support n'th from the end, somehow */   \
-      internal_error(__func__, "unanticipated case first=%d w=%d headw=%d", first, w, headw);                \
+      internal_error(__func__, "unanticipated case first=%d w=%d headw=%d", first, w, headw);      \
     }                                                                                              \
   }
   switch(TYPEOF(x)) {
@@ -1282,4 +1283,3 @@ SEXP gshift(SEXP x, SEXP nArg, SEXP fillArg, SEXP typeArg) {
   // consistency with plain shift(): "strip" the list in the 1-input case, for convenience
   return isVectorAtomic(x) && length(ans) == 1 ? VECTOR_ELT(ans, 0) : ans;
 }
-
diff --git a/src/init.c b/src/init.c
@@ -364,4 +364,3 @@ SEXP dllVersion(void) {
   // .onLoad calls this and checks the same as packageVersion() to ensure no R/C version mismatch, #3056
   return(ScalarString(mkChar("1.17.99")));
 }
-
diff --git a/src/myomp.h b/src/myomp.h
@@ -26,4 +26,3 @@
   #define omp_get_wtime()        0
   #define MY_OPENMP              0
 #endif
-
diff --git a/src/negate.c b/src/negate.c
@@ -19,4 +19,3 @@ SEXP notchin(SEXP x, SEXP table) {
   UNPROTECT(1);
   return result;
 }
-
diff --git a/src/openmp-utils.c b/src/openmp-utils.c
@@ -186,4 +186,3 @@ void avoid_openmp_hang_within_fork(void) {
   pthread_atfork(&when_fork, &after_fork, NULL);
 #endif
 }
-
diff --git a/src/quickselect.c b/src/quickselect.c
@@ -68,4 +68,3 @@ double i64quickselect(int64_t *x, int n) {
   int64_t a, b;
   BODY(i64swap);
 }
-
diff --git a/src/rbindlist.c b/src/rbindlist.c
@@ -198,7 +198,7 @@ SEXP rbindlist(SEXP l, SEXP usenamesArg, SEXP fillArg, SEXP idcolArg, SEXP ignor
     // Ensure no missings in both cases, and (when usenames==NA) all columns in same order too
     // We proceeded earlier as if fill was true, so varying ncol items will have missing here
     char buff[1001] = "";
-    const char *extra = usenames==TRUE?"":_(" use.names='check' (default from v1.12.2) emits this message and proceeds as if use.names=FALSE for "\
+    const char *extra = usenames==TRUE?"":_(" use.names='check' (default from v1.12.2) emits this message and proceeds as if use.names=FALSE for "
                                             " backwards compatibility. See news item 5 in v1.12.2 for options to control this message.");
     for (int i=0; i<LENGTH(l); ++i) {
       SEXP li = VECTOR_ELT(l, i);
diff --git a/src/reorder.c b/src/reorder.c
@@ -125,4 +125,3 @@ SEXP setcolorder(SEXP x, SEXP o)
   UNPROTECT(1);
   return R_NilValue;
 }
-
diff --git a/src/subset.c b/src/subset.c
@@ -376,4 +376,3 @@ SEXP subsetVector(SEXP x, SEXP idx) { // idx is 1-based passed from R level
   UNPROTECT(nprotect);
   return ans;
 }
-
diff --git a/src/transpose.c b/src/transpose.c
@@ -102,4 +102,3 @@ SEXP transpose(SEXP l, SEXP fill, SEXP ignoreArg, SEXP keepNamesArg, SEXP listCo
   UNPROTECT(nprotect);
   return ans;
 }
-
diff --git a/src/types.h b/src/types.h
@@ -1,4 +1,4 @@
-#include<stdint.h>
+#include <stdint.h>
 
 /*
  * a struct to carry out results of embarrassingly parallel computation
diff --git a/src/uniqlist.c b/src/uniqlist.c
@@ -45,7 +45,7 @@ SEXP uniqlist(SEXP l, SEXP order)
           iidx[len++] = i+1;                                                     \
           if (len>=isize) {                                                      \
             isize = MIN(nrow, (size_t)(1.1*(double)isize*((double)nrow/i)));     \
-            iidx = R_Realloc(iidx, isize, int);                                    \
+            iidx = R_Realloc(iidx, isize, int);                                  \
           }                                                                      \
         }                                                                        \
         prev = elem;                                                             \
@@ -372,4 +372,3 @@ SEXP uniqueNlogical(SEXP x, SEXP narmArg) {
     return ScalarInteger(3-narm);
   return ScalarInteger(2-(narm && third!=NA_LOGICAL));
 }
-
diff --git a/src/vecseq.c b/src/vecseq.c
@@ -39,4 +39,3 @@ SEXP vecseq(SEXP x, SEXP len, SEXP clamp)
   UNPROTECT(1);
   return(ans);
 }
-

Original file line number	Diff line number	Diff line change
`@@ -1335,4 +1335,3 @@ SEXP setcharvec(SEXP x, SEXP which, SEXP newx)`
`1335`	`1335`	`}`
`1336`	`1336`	`return R_NilValue;`
`1337`	`1337`	`}`
`1338`		`-`
Original file line number	Diff line number	Diff line change
`@@ -99,4 +99,3 @@ SEXP cj(SEXP base_list) {`
`99`	`99`	`UNPROTECT(1);`
`100`	`100`	`return out;`
`101`	`101`	`}`
`102`		`-`
Original file line number	Diff line number	Diff line change
`@@ -172,4 +172,3 @@ SEXP coalesce(SEXP x, SEXP inplaceArg) {`
`172`	`172`	`UNPROTECT(nprotect);`
`173`	`173`	`return first;`
`174`	`174`	`}`
`175`		`-`
-Original file line number
+Diff line change
       COMPLEX(ans)[0].i = (double) si;
       break;
 */
+-
Original file line number	Diff line number	Diff line change
`@@ -347,4 +347,3 @@ SEXP fsort(SEXP x, SEXP verboseArg) {`
`347`	`347`	`UNPROTECT(nprotect);`
`348`	`348`	`return(ansVec);`
`349`	`349`	`}`
`350`		`-`
Original file line number	Diff line number	Diff line change
`@@ -120,4 +120,3 @@ typedef struct fwriteMainArgs`
`120`	`120`	`} fwriteMainArgs;`
`121`	`121`
`122`	`122`	`void fwriteMain(fwriteMainArgs args);`
`123`		`-`
Original file line number	Diff line number	Diff line change
`@@ -839,7 +839,8 @@ static SEXP gminmax(SEXP x, SEXP narm, const bool min)`
`839`	`839`	`ansd[thisgrp] = elem;`
`840`	`840`	`}`
`841`	`841`	`}`
`842`		`- }}`
	`842`	`+ }`
	`843`	`+ }`
`843`	`844`	`break;`
`844`	`845`	`case CPLXSXP:`
`845`	`846`	`error(_("Type 'complex' has no well-defined min/max"));`
`@@ -972,7 +973,7 @@ static SEXP gfirstlast(SEXP x, const bool first, const int w, const bool headw)`
`972`	`973`	`} else { \`
`973`	`974`	`/* w>1 && !first not supported because -i in R means everything-but-i and gnthvalue */ \`
`974`	`975`	`/* currently takes n>0 only. However, we could still support n'th from the end, somehow */ \`
`975`		`- internal_error(__func__, "unanticipated case first=%d w=%d headw=%d", first, w, headw); \`
	`976`	`+ internal_error(__func__, "unanticipated case first=%d w=%d headw=%d", first, w, headw); \`
`976`	`977`	`} \`
`977`	`978`	`}`
`978`	`979`	`switch(TYPEOF(x)) {`
`@@ -1282,4 +1283,3 @@ SEXP gshift(SEXP x, SEXP nArg, SEXP fillArg, SEXP typeArg) {`
`1282`	`1283`	`// consistency with plain shift(): "strip" the list in the 1-input case, for convenience`
`1283`	`1284`	`return isVectorAtomic(x) && length(ans) == 1 ? VECTOR_ELT(ans, 0) : ans;`
`1284`	`1285`	`}`
`1285`		`-`