summaryrefslogtreecommitdiff
path: root/git-compat-util.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-09-13 18:38:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-09-13 18:38:23 (GMT)
commitf322e9f51b5a2ca303a6691d0e2d1f3f754923ff (patch)
tree854b7f33b056c6233b10e7e7e164c3bb6fb34f76 /git-compat-util.h
parent04791386457e48220ee4388b9b3b51e36203d8c1 (diff)
parentd4a492f4ad0455710a7db8c589f4865810b0d0b7 (diff)
downloadgit-f322e9f51b5a2ca303a6691d0e2d1f3f754923ff.zip
git-f322e9f51b5a2ca303a6691d0e2d1f3f754923ff.tar.gz
git-f322e9f51b5a2ca303a6691d0e2d1f3f754923ff.tar.bz2
Merge branch 'ab/submodule-helper-prep'
Code clean-up of "git submodule--helper". * ab/submodule-helper-prep: (33 commits) submodule--helper: fix bad config API usage submodule--helper: libify even more "die" paths for module_update() submodule--helper: libify more "die" paths for module_update() submodule--helper: check repo{_submodule,}_init() return values submodule--helper: libify "must_die_on_failure" code paths (for die) submodule--helper update: don't override 'checkout' exit code submodule--helper: libify "must_die_on_failure" code paths submodule--helper: libify determine_submodule_update_strategy() submodule--helper: don't exit() on failure, return submodule--helper: use "code" in run_update_command() submodule API: don't handle SM_..{UNSPECIFIED,COMMAND} in to_string() submodule--helper: don't call submodule_strategy_to_string() in BUG() submodule--helper: add missing braces to "else" arm submodule--helper: return "ret", not "1" from update_submodule() submodule--helper: rename "int res" to "int ret" submodule--helper: don't redundantly check "else if (res)" submodule--helper: refactor "errmsg_str" to be a "struct strbuf" submodule--helper: add "const" to passed "struct update_data" submodule--helper: add "const" to copy of "update_data" submodule--helper: add "const" to passed "module_clone_data" ...
Diffstat (limited to 'git-compat-util.h')
-rw-r--r--git-compat-util.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/git-compat-util.h b/git-compat-util.h
index 4e51a1c..7ebae12 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -569,8 +569,11 @@ static inline int git_has_dir_sep(const char *path)
/* The sentinel attribute is valid from gcc version 4.0 */
#if defined(__GNUC__) && (__GNUC__ >= 4)
#define LAST_ARG_MUST_BE_NULL __attribute__((sentinel))
+/* warn_unused_result exists as of gcc 3.4.0, but be lazy and check 4.0 */
+#define RESULT_MUST_BE_USED __attribute__ ((warn_unused_result))
#else
#define LAST_ARG_MUST_BE_NULL
+#define RESULT_MUST_BE_USED
#endif
#define MAYBE_UNUSED __attribute__((__unused__))