Small clang-format fixes

flux-framework · Nov 7, 2023 · bcb463e · bcb463e
1 parent 9c3a6f5
commit bcb463e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/.clang-format b/.clang-format
@@ -11,7 +11,7 @@ BinPackParameters: 'false'
 BreakBeforeBinaryOperators: NonAssignment
 BreakBeforeBraces: Linux
 BreakBeforeTernaryOperators: 'true'
-ColumnLimit: '90'
+ColumnLimit: '100'
 ConstructorInitializerAllOnOneLineOrOnePerLine: 'true'
 IndentWidth: '4'
 PenaltyBreakBeforeFirstCallParameter: '10000000'

diff --git a/src/core/dyad_core.h b/src/core/dyad_core.h
@@ -65,9 +65,8 @@ typedef struct dyad_metadata dyad_metadata_t;
     } while (0)
 #endif  // DPRINTF
 
-#define TIME_DIFF(Tstart, Tend)                                                \
-    ((double)(1000000000L * ((Tend).tv_sec - (Tstart).tv_sec) + (Tend).tv_nsec \
-              - (Tstart).tv_nsec)                                              \
+#define TIME_DIFF(Tstart, Tend)                                                                    \
+    ((double)(1000000000L * ((Tend).tv_sec - (Tstart).tv_sec) + (Tend).tv_nsec - (Tstart).tv_nsec) \
      / 1000000000L)
 
 // Detailed information message that can be omitted
@@ -119,8 +118,7 @@ DYAD_DLL_EXPORTED dyad_rc_t dyad_init_env (dyad_ctx_t** ctx);
  *
  * @return An error code from dyad_rc.h
  */
-DYAD_PFA_ANNOTATE DYAD_DLL_EXPORTED dyad_rc_t dyad_produce (dyad_ctx_t* ctx,
-                                                            const char* fname);
+DYAD_PFA_ANNOTATE DYAD_DLL_EXPORTED dyad_rc_t dyad_produce (dyad_ctx_t* ctx, const char* fname);
 
 /**
  * @brief Obtain DYAD metadata for a file in the consumer-managed directory
@@ -136,8 +134,7 @@ DYAD_PFA_ANNOTATE DYAD_DLL_EXPORTED dyad_rc_t dyad_get_metadata (dyad_ctx_t* ctx
                                                                  bool should_wait,
                                                                  dyad_metadata_t** mdata);
 
-DYAD_PFA_ANNOTATE DYAD_DLL_EXPORTED dyad_rc_t
-dyad_free_metadata (dyad_metadata_t** mdata);
+DYAD_PFA_ANNOTATE DYAD_DLL_EXPORTED dyad_rc_t dyad_free_metadata (dyad_metadata_t** mdata);
 
 /**
  * @brief Wrapper function that performs all the common tasks needed
@@ -147,8 +144,7 @@ dyad_free_metadata (dyad_metadata_t** mdata);
  *
  * @return An error code from dyad_rc.h
  */
-DYAD_PFA_ANNOTATE DYAD_DLL_EXPORTED dyad_rc_t dyad_consume (dyad_ctx_t* ctx,
-                                                            const char* fname);
+DYAD_PFA_ANNOTATE DYAD_DLL_EXPORTED dyad_rc_t dyad_consume (dyad_ctx_t* ctx, const char* fname);
 
 /**
  * @brief Finalizes the DYAD instance and deallocates the context
@@ -159,8 +155,7 @@ DYAD_PFA_ANNOTATE DYAD_DLL_EXPORTED dyad_rc_t dyad_consume (dyad_ctx_t* ctx,
 DYAD_DLL_EXPORTED dyad_rc_t dyad_finalize (dyad_ctx_t** ctx);
 
 #if DYAD_SYNC_DIR
-DYAD_PFA_ANNOTATE DYAD_DLL_EXPORTED int dyad_sync_directory (dyad_ctx_t* ctx,
-                                                             const char* path);
+DYAD_PFA_ANNOTATE DYAD_DLL_EXPORTED int dyad_sync_directory (dyad_ctx_t* ctx, const char* path);
 #endif
 
 #ifdef __cplusplus