content: correct message unpack style

Problem: The typical message unpack style is to place key names and storage pointers on the same line, but that is not done in several locations in the content and content backing modules. Correct code style to be more consistent to the rest of flux-core.
chu11 · Sep 3, 2024 · 3f4fbd4 · 3f4fbd4
1 parent f94d669
commit 3f4fbd4
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 30 deletions.
diff --git a/src/modules/content-files/content-files.c b/src/modules/content-files/content-files.c
@@ -227,8 +227,7 @@ void checkpoint_get_cb (flux_t *h,
     if (flux_respond_pack (h,
                            msg,
                            "{s:O}",
-                           "value",
-                           o) < 0)
+                           "value", o) < 0)
         flux_log_error (h, "error responding to checkpoint-get request");
     free (data);
     json_decref (o);
@@ -257,10 +256,8 @@ void checkpoint_put_cb (flux_t *h,
     if (flux_request_unpack (msg,
                              NULL,
                              "{s:s s:o}",
-                             "key",
-                             &key,
-                             "value",
-                             &o) < 0)
+                             "key", &key,
+                             "value", &o) < 0)
         goto error;
     if (!(value = json_dumps (o, JSON_COMPACT))) {
         errstr = "failed to encode checkpoint value";

diff --git a/src/modules/content-s3/content-s3.c b/src/modules/content-s3/content-s3.c
@@ -158,14 +158,10 @@ static struct s3_config *parse_config (const flux_conf_t *conf,
                           &error,
                           "{s:{s:s, s:s, s:s, s?b !} }",
                           "content-s3",
-                          "credential-file",
-                          &cred_file,
-                          "bucket",
-                          &bucket,
-                          "uri",
-                          &uri,
-                          "virtual-host-style",
-                          &is_virtual_host) < 0) {
+                          "credential-file", &cred_file,
+                          "bucket", &bucket,
+                          "uri", &uri,
+                          "virtual-host-style", &is_virtual_host) < 0) {
         errprintf (errp, "%s", error.text);
         goto error;
     }
@@ -367,8 +363,7 @@ void checkpoint_get_cb (flux_t *h,
     if (flux_respond_pack (h,
                            msg,
                            "{s:O}",
-                           "value",
-                           o) < 0) {
+                           "value", o) < 0) {
         errno = EIO;
         flux_log_error (h, "error responding to checkpoint-get request (pack)");
     }
@@ -400,10 +395,8 @@ void checkpoint_put_cb (flux_t *h,
     if (flux_request_unpack (msg,
                              NULL,
                              "{s:s s:o}",
-                             "key",
-                             &key,
-                             "value",
-                             &o) < 0)
+                             "key", &key,
+                             "value", &o) < 0)
         goto error;
     if (!(value = json_dumps (o, JSON_COMPACT))) {
         errstr = "failed to encode checkpoint value";

diff --git a/src/modules/content-sqlite/content-sqlite.c b/src/modules/content-sqlite/content-sqlite.c
@@ -413,8 +413,7 @@ void checkpoint_get_cb (flux_t *h,
     if (flux_respond_pack (h,
                            msg,
                            "{s:O}",
-                           "value",
-                           o) < 0)
+                           "value", o) < 0)
         flux_log_error (h, "flux_respond_pack");
     (void )sqlite3_reset (ctx->checkpt_get_stmt);
     json_decref (o);
@@ -440,10 +439,8 @@ void checkpoint_put_cb (flux_t *h,
     if (flux_request_unpack (msg,
                              NULL,
                              "{s:s s:o}",
-                             "key",
-                             &key,
-                             "value",
-                             &o) < 0)
+                             "key", &key,
+                             "value", &o) < 0)
         goto error;
     if (!(value = json_dumps (o, JSON_COMPACT))) {
         errstr = "failed to encode checkpoint value";

diff --git a/src/modules/content/checkpoint.c b/src/modules/content/checkpoint.c
@@ -282,10 +282,8 @@ void content_checkpoint_put_request (flux_t *h, flux_msg_handler_t *mh,
     if (flux_request_unpack (msg,
                              NULL,
                              "{s:s s:o}",
-                             "key",
-                             &key,
-                             "value",
-                             &value) < 0)
+                             "key", &key,
+                             "value", &value) < 0)
         goto error;
 
     if (checkpoint->rank == 0) {