files_ref_store::submodule: use NULL for the main repository
The old practice of storing the empty string in this member for the main repository was a holdover from before 00eebe3 (refs: create a base class "ref_store" for files_ref_store, 2016-09-04), when the submodule was stored in a flex array at the end of `struct files_ref_store`. Storing NULL for this case is more idiomatic and a tiny bit less code. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael Haggerty committed
Feb 10, 2017 at 12:16 UTC
9c7d772b6b716ec5f81afd3922340588985066b8
1 file changed
+8
-8
refs/files-backend.c
+8
-8
@@ -915,8 +915,8 @@ struct files_ref_store {
915
916
/*
917
* The name of the submodule represented by this object, or
918
- * the empty string if it represents the main repository's
919
- * reference store:
918
+ * NULL if it represents the main repository's reference
919
+ * store:
920
*/
921
const char *submodule;
922
@@ -982,7 +982,7 @@ static struct ref_store *files_ref_store_create(const char *submodule)
982
983
base_ref_store_init(ref_store, &refs_be_files);
984
985
- refs->submodule = submodule ? xstrdup(submodule) : "";
985
+ refs->submodule = xstrdup_or_null(submodule);
986
987
return ref_store;
988
}
@@ -994,7 +994,7 @@ static struct ref_store *files_ref_store_create(const char *submodule)
994
static void files_assert_main_repository(struct files_ref_store *refs,
995
const char *caller)
996
{
997
- if (*refs->submodule)
997
+ if (refs->submodule)
998
die("BUG: %s called for a submodule", caller);
999
}
1000
@@ -1158,7 +1158,7 @@ static struct packed_ref_cache *get_packed_ref_cache(struct files_ref_store *ref
1158
{
1159
char *packed_refs_file;
1160
1161
- if (*refs->submodule)
1161
+ if (refs->submodule)
1162
packed_refs_file = git_pathdup_submodule(refs->submodule,
1163
"packed-refs");
1164
else
@@ -1228,7 +1228,7 @@ static void read_loose_refs(const char *dirname, struct ref_dir *dir)
1228
size_t path_baselen;
1229
int err = 0;
1230
1231
- if (*refs->submodule)
1231
+ if (refs->submodule)
1232
err = strbuf_git_path_submodule(&path, refs->submodule, "%s", dirname);
1233
else
1234
strbuf_git_path(&path, "%s", dirname);
@@ -1269,7 +1269,7 @@ static void read_loose_refs(const char *dirname, struct ref_dir *dir)
1269
} else {
1270
int read_ok;
1271
1272
- if (*refs->submodule) {
1272
+ if (refs->submodule) {
1273
hashclr(sha1);
1274
flag = 0;
1275
read_ok = !resolve_gitlink_ref(refs->submodule,
@@ -1383,7 +1383,7 @@ static int files_read_raw_ref(struct ref_store *ref_store,
1383
*type = 0;
1384
strbuf_reset(&sb_path);
1385
1386
- if (*refs->submodule)
1386
+ if (refs->submodule)
1387
strbuf_git_path_submodule(&sb_path, refs->submodule, "%s", refname);
1388
else
1389
strbuf_git_path(&sb_path, "%s", refname);