Some callback error check style cleanups

I find this easier to read...

diff --git a/src/attr.c b/src/attr.c
index 08d7ee99df8a2ae76a7cb043212397749bd54419..553c071bedf7d5db462f46728f29941d79511013 100644 (file)
--- a/src/attr.c
+++ b/src/attr.c
@@ -191,10 +191,11 @@ int git_attr_foreach(
                                if (error < 0)
                                        goto cleanup;
 
-                               error = GITERR_CALLBACK(
-                                       callback(assign->name, assign->value, payload) );
-                               if (error)
+                               error = callback(assign->name, assign->value, payload);
+                               if (error) {
+                                       GITERR_CALLBACK(error);
                                        goto cleanup;
+                               }
                        }
                }
        }

diff --git a/src/diff.c b/src/diff.c
index 101426f6e0754b2cc271448f75e02be89473aa8f..b7657e43209fc1687af15b719c5e3e3310e53c34 100644 (file)
--- a/src/diff.c
+++ b/src/diff.c
@@ -1388,8 +1388,10 @@ int git_diff__paired_foreach(
                        i++; j++;
                }
 
-               if ((error = GITERR_CALLBACK( cb(h2i, i2w, payload) )) != 0)
+               if ((error = cb(h2i, i2w, payload)) != 0) {
+                       GITERR_CALLBACK(error);
                        break;
+               }
        }
 
        /* restore case-insensitive delta sort */

diff --git a/src/fetchhead.c b/src/fetchhead.c
index 7c37be4c634e49fb2a30fbc6a86a4e00a54ba0d5..2f217fad10eb47271373d7eb258ea4ee6859a7ce 100644 (file)
--- a/src/fetchhead.c
+++ b/src/fetchhead.c
@@ -260,8 +260,8 @@ int git_repository_fetchhead_foreach(git_repository *repo,
        while ((line = git__strsep(&buffer, "\n")) != NULL) {
                ++line_num;
 
-               if ((error = fetchhead_ref_parse(&oid, &is_merge, &name, &remote_url,
-                       line, line_num)) < 0)
+               if ((error = fetchhead_ref_parse(
+                               &oid, &is_merge, &name, &remote_url, line, line_num)) < 0)
                        goto done;
 
                if (git_buf_len(&name) > 0)
@@ -269,10 +269,11 @@ int git_repository_fetchhead_foreach(git_repository *repo,
                else
                        ref_name = NULL;
 
-               error = GITERR_CALLBACK(
-                       cb(ref_name, remote_url, &oid, is_merge, payload) );
-               if (error)
+               error = cb(ref_name, remote_url, &oid, is_merge, payload);
+               if (error) {
+                       GITERR_CALLBACK(error);
                        goto done;
+               }
        }
 
        if (*buffer) {

diff --git a/src/merge.c b/src/merge.c
index 6f73fc14a1fbba28920e84042da8bf64f9341310..f1778c9504b51a22b840da180c621af6211f4f4d 100644 (file)
--- a/src/merge.c
+++ b/src/merge.c
@@ -287,8 +287,10 @@ int git_repository_mergehead_foreach(
                if ((error = git_oid_fromstr(&oid, line)) < 0)
                        goto cleanup;
 
-               if ((error = GITERR_CALLBACK( cb(&oid, payload) )) != 0)
+               if ((error = cb(&oid, payload)) != 0) {
+                       GITERR_CALLBACK(error);
                        goto cleanup;
+               }
 
                ++line_num;
        }

diff --git a/src/pack-objects.c b/src/pack-objects.c
index 2f0007f4f8d7e27590f95b3c49ea4e0dd5cf944a..09b7248af6971623d4db1ebae79bf93a752200d2 100644 (file)
--- a/src/pack-objects.c
+++ b/src/pack-objects.c
@@ -229,9 +229,12 @@ int git_packbuilder_insert(git_packbuilder *pb, const git_oid *oid,
                if (elapsed >= MIN_PROGRESS_UPDATE_INTERVAL) {
                        pb->last_progress_report_time = current_time;
 
-                       return GITERR_CALLBACK( pb->progress_cb(
+                       ret = pb->progress_cb(
                                GIT_PACKBUILDER_ADDING_OBJECTS,
-                               pb->nr_objects, 0, pb->progress_cb_payload) );
+                               pb->nr_objects, 0, pb->progress_cb_payload);
+
+                       if (ret)
+                               return GITERR_CALLBACK(ret);
                }
        }
 

diff --git a/src/pack.c b/src/pack.c
index 3f2adb2f305fcfb0633cdd92b373f4eaf89f84b5..fd53ef49ae908993913e95822632c820a969a2c2 100644 (file)
--- a/src/pack.c
+++ b/src/pack.c
@@ -1088,8 +1088,10 @@ int git_pack_foreach_entry(
        }
 
        for (i = 0; i < p->num_objects; i++)
-               if ((error = GITERR_CALLBACK( cb(p->oids[i], data) )) != 0)
+               if ((error = cb(p->oids[i], data)) != 0) {
+                       GITERR_CALLBACK(error);
                        break;
+               }
 
        return error;
 }

diff --git a/src/path.c b/src/path.c
index 857a2e61c3e742b0c6ef284c0d7aaa94c0f9d32c..8c19e004e7bb37f4f5d9413499bc1c0d6191bd16 100644 (file)
--- a/src/path.c
+++ b/src/path.c
@@ -434,10 +434,13 @@ int git_path_walk_up(
        iter.asize = path->asize;
 
        while (scan >= stop) {
-               error = GITERR_CALLBACK( cb(data, &iter) );
+               error = cb(data, &iter);
                iter.ptr[scan] = oldc;
-               if (error)
+
+               if (error) {
+                       GITERR_CALLBACK(error);
                        break;
+               }
 
                scan = git_buf_rfind_next(&iter, '/');
                if (scan >= 0) {
@@ -874,12 +877,14 @@ int git_path_direach(
                if ((error = git_buf_put(path, de_path, de_len)) < 0)
                        break;
 
-               error = GITERR_CALLBACK( fn(arg, path) );
+               error = fn(arg, path);
 
                git_buf_truncate(path, wd_len); /* restore path */
 
-               if (error)
+               if (error != 0) {
+                       GITERR_CALLBACK(error);
                        break;
+               }
        }
 
        closedir(dir);

diff --git a/src/push.c b/src/push.c
index 4281733979f0c546b8267ee6f67d4d167c2f2b35..8ebba15eb2101e3b918ee4702d657d96a5a5ef3b 100644 (file)
--- a/src/push.c
+++ b/src/push.c
@@ -659,8 +659,9 @@ int git_push_status_foreach(git_push *push,
        unsigned int i;
 
        git_vector_foreach(&push->status, i, status) {
-               GITERR_CHECK_ERROR(
-                       GITERR_CALLBACK( cb(status->ref, status->msg, data) ) );
+               int error = cb(status->ref, status->msg, data);
+               if (error)
+                       return GITERR_CALLBACK(error);
        }
 
        return 0;

diff --git a/src/remote.c b/src/remote.c
index 307306d1a525bee54410c08a17053f152e747e73..d46364a81538dbd6a8f744139bb81eb5813a3bbc 100644 (file)
--- a/src/remote.c
+++ b/src/remote.c
@@ -1348,9 +1348,11 @@ static int rename_fetch_refspecs(
                if (!remote->name ||
                        strcmp(git_buf_cstr(&base), spec->string)) {
 
-                       error = GITERR_CALLBACK( callback(spec->string, payload) );
-                       if (error)
+                       if ((error = callback(spec->string, payload)) != 0) {
+                               GITERR_CALLBACK(error);
                                break;
+                       }
+
                        continue;
                }
 

diff --git a/src/stash.c b/src/stash.c
index 458a1e17540ec37378d05d6e9da80c60bed48ccd..fb5bb2e5523bb7511cc963bca83f7c0fe8430fac 100644 (file)
--- a/src/stash.c
+++ b/src/stash.c
@@ -582,13 +582,15 @@ int git_stash_foreach(
        for (i = 0; i < max; i++) {
                entry = git_reflog_entry_byindex(reflog, i);
 
-               error = GITERR_CALLBACK(
-                       callback(i,
-                               git_reflog_entry_message(entry),
-                               git_reflog_entry_id_new(entry),
-                               payload) );
-               if (error)
+               error = callback(i,
+                       git_reflog_entry_message(entry),
+                       git_reflog_entry_id_new(entry),
+                       payload);
+
+               if (error) {
+                       GITERR_CALLBACK(error);
                        break;
+               }
        }
 
 cleanup:

diff --git a/src/status.c b/src/status.c
index d76617a7247907e46b5c85dc31c5f0599c08e454..d4a436283dac77d62b4ac6fb0a65ea55fb9b7771 100644 (file)
--- a/src/status.c
+++ b/src/status.c
@@ -392,9 +392,10 @@ int git_status_foreach_ext(
                        status_entry->head_to_index->old_file.path :
                        status_entry->index_to_workdir->old_file.path;
 
-               error = GITERR_CALLBACK( cb(path, status_entry->status, payload) );
-               if (error)
+               if ((error = cb(path, status_entry->status, payload)) != 0) {
+                       GITERR_CALLBACK(error);
                        break;
+               }
        }
 
        git_status_list_free(status);

diff --git a/src/submodule.c b/src/submodule.c
index e9d534ae8fdb1cd55cc45db56c54a9db1f44b52d..5298302c7051c8092638cd74fccb7ade2b433aeb 100644 (file)
--- a/src/submodule.c
+++ b/src/submodule.c
@@ -168,8 +168,10 @@ int git_submodule_foreach(
                                break;
                }
 
-               if ((error = GITERR_CALLBACK(callback(sm, sm->name, payload))) != 0)
+               if ((error = callback(sm, sm->name, payload)) != 0) {
+                       GITERR_CALLBACK(error);
                        break;
+               }
        });
 
        git_vector_free(&seen);