aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Lukas Fleischer <cgit@cryptocrack.de>2014-01-10 20:44:35 (JST)
committerGravatar Jason A. Donenfeld <Jason@zx2c4.com>2014-01-11 01:01:29 (JST)
commit36bdb2171f7154fcdf1a24d38c8ce3bd7e448cb1 (patch)
tree06a5bc8163bde09074e18ad5e66deb35ebb136c6
parentd523dacc3b1c93bb186cdd0ddb5e721162aa927e (diff)
downloadcgit-36bdb2171f7154fcdf1a24d38c8ce3bd7e448cb1.zip
cgit-36bdb2171f7154fcdf1a24d38c8ce3bd7e448cb1.tar.gz
Replace most uses of strncmp() with prefixcmp()
This is a preparation for replacing all prefix checks with either strip_prefix() or starts_with() when Git 1.8.6 is released. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
-rw-r--r--cgit.c18
-rw-r--r--parsing.c12
-rw-r--r--scan-tree.c2
-rw-r--r--ui-refs.c4
-rw-r--r--ui-shared.c2
-rw-r--r--ui-summary.c2
6 files changed, 20 insertions, 20 deletions
diff --git a/cgit.c b/cgit.c
index 1f84da8..e31962d 100644
--- a/cgit.c
+++ b/cgit.c
@@ -863,7 +863,7 @@ static void cgit_parse_args(int argc, const char **argv)
863 int scan = 0; 863 int scan = 0;
864 864
865 for (i = 1; i < argc; i++) { 865 for (i = 1; i < argc; i++) {
866 if (!strncmp(argv[i], "--cache=", 8)) { 866 if (!prefixcmp(argv[i], "--cache=")) {
867 ctx.cfg.cache_root = xstrdup(argv[i] + 8); 867 ctx.cfg.cache_root = xstrdup(argv[i] + 8);
868 } 868 }
869 if (!strcmp(argv[i], "--nocache")) { 869 if (!strcmp(argv[i], "--nocache")) {
@@ -872,28 +872,28 @@ static void cgit_parse_args(int argc, const char **argv)
872 if (!strcmp(argv[i], "--nohttp")) { 872 if (!strcmp(argv[i], "--nohttp")) {
873 ctx.env.no_http = "1"; 873 ctx.env.no_http = "1";
874 } 874 }
875 if (!strncmp(argv[i], "--query=", 8)) { 875 if (!prefixcmp(argv[i], "--query=")) {
876 ctx.qry.raw = xstrdup(argv[i] + 8); 876 ctx.qry.raw = xstrdup(argv[i] + 8);
877 } 877 }
878 if (!strncmp(argv[i], "--repo=", 7)) { 878 if (!prefixcmp(argv[i], "--repo=")) {
879 ctx.qry.repo = xstrdup(argv[i] + 7); 879 ctx.qry.repo = xstrdup(argv[i] + 7);
880 } 880 }
881 if (!strncmp(argv[i], "--page=", 7)) { 881 if (!prefixcmp(argv[i], "--page=")) {
882 ctx.qry.page = xstrdup(argv[i] + 7); 882 ctx.qry.page = xstrdup(argv[i] + 7);
883 } 883 }
884 if (!strncmp(argv[i], "--head=", 7)) { 884 if (!prefixcmp(argv[i], "--head=")) {
885 ctx.qry.head = xstrdup(argv[i] + 7); 885 ctx.qry.head = xstrdup(argv[i] + 7);
886 ctx.qry.has_symref = 1; 886 ctx.qry.has_symref = 1;
887 } 887 }
888 if (!strncmp(argv[i], "--sha1=", 7)) { 888 if (!prefixcmp(argv[i], "--sha1=")) {
889 ctx.qry.sha1 = xstrdup(argv[i] + 7); 889 ctx.qry.sha1 = xstrdup(argv[i] + 7);
890 ctx.qry.has_sha1 = 1; 890 ctx.qry.has_sha1 = 1;
891 } 891 }
892 if (!strncmp(argv[i], "--ofs=", 6)) { 892 if (!prefixcmp(argv[i], "--ofs=")) {
893 ctx.qry.ofs = atoi(argv[i] + 6); 893 ctx.qry.ofs = atoi(argv[i] + 6);
894 } 894 }
895 if (!strncmp(argv[i], "--scan-tree=", 12) || 895 if (!prefixcmp(argv[i], "--scan-tree=") ||
896 !strncmp(argv[i], "--scan-path=", 12)) { 896 !prefixcmp(argv[i], "--scan-path=")) {
897 /* HACK: the global snapshot bitmask defines the 897 /* HACK: the global snapshot bitmask defines the
898 * set of allowed snapshot formats, but the config 898 * set of allowed snapshot formats, but the config
899 * file hasn't been parsed yet so the mask is 899 * file hasn't been parsed yet so the mask is
diff --git a/parsing.c b/parsing.c
index 248b6ee..d740d38 100644
--- a/parsing.c
+++ b/parsing.c
@@ -142,25 +142,25 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
142 if (p == NULL) 142 if (p == NULL)
143 return ret; 143 return ret;
144 144
145 if (strncmp(p, "tree ", 5)) 145 if (prefixcmp(p, "tree "))
146 die("Bad commit: %s", sha1_to_hex(commit->object.sha1)); 146 die("Bad commit: %s", sha1_to_hex(commit->object.sha1));
147 else 147 else
148 p += 46; // "tree " + hex[40] + "\n" 148 p += 46; // "tree " + hex[40] + "\n"
149 149
150 while (!strncmp(p, "parent ", 7)) 150 while (!prefixcmp(p, "parent "))
151 p += 48; // "parent " + hex[40] + "\n" 151 p += 48; // "parent " + hex[40] + "\n"
152 152
153 if (p && !strncmp(p, "author ", 7)) { 153 if (p && !prefixcmp(p, "author ")) {
154 p = parse_user(p + 7, &ret->author, &ret->author_email, 154 p = parse_user(p + 7, &ret->author, &ret->author_email,
155 &ret->author_date); 155 &ret->author_date);
156 } 156 }
157 157
158 if (p && !strncmp(p, "committer ", 9)) { 158 if (p && !prefixcmp(p, "committer ")) {
159 p = parse_user(p + 9, &ret->committer, &ret->committer_email, 159 p = parse_user(p + 9, &ret->committer, &ret->committer_email,
160 &ret->committer_date); 160 &ret->committer_date);
161 } 161 }
162 162
163 if (p && !strncmp(p, "encoding ", 9)) { 163 if (p && !prefixcmp(p, "encoding ")) {
164 p += 9; 164 p += 9;
165 t = strchr(p, '\n'); 165 t = strchr(p, '\n');
166 if (t) { 166 if (t) {
@@ -239,7 +239,7 @@ struct taginfo *cgit_parse_tag(struct tag *tag)
239 if (*p == '\n') 239 if (*p == '\n')
240 break; 240 break;
241 241
242 if (!strncmp(p, "tagger ", 7)) { 242 if (!prefixcmp(p, "tagger ")) {
243 p = parse_user(p + 7, &ret->tagger, &ret->tagger_email, 243 p = parse_user(p + 7, &ret->tagger, &ret->tagger_email,
244 &ret->tagger_date); 244 &ret->tagger_date);
245 } else { 245 } else {
diff --git a/scan-tree.c b/scan-tree.c
index 1a2ea87..49de658 100644
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -105,7 +105,7 @@ static void add_repo(const char *base, struct strbuf *path, repo_config_fn fn)
105 return; 105 return;
106 strbuf_setlen(path, pathlen); 106 strbuf_setlen(path, pathlen);
107 107
108 if (strncmp(base, path->buf, strlen(base))) 108 if (prefixcmp(path->buf, base))
109 strbuf_addbuf(&rel, path); 109 strbuf_addbuf(&rel, path);
110 else 110 else
111 strbuf_addstr(&rel, path->buf + strlen(base) + 1); 111 strbuf_addstr(&rel, path->buf + strlen(base) + 1);
diff --git a/ui-refs.c b/ui-refs.c
index 7af6fed..20c91e3 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -240,9 +240,9 @@ void cgit_print_refs()
240 240
241 html("<table class='list nowrap'>"); 241 html("<table class='list nowrap'>");
242 242
243 if (ctx.qry.path && !strncmp(ctx.qry.path, "heads", 5)) 243 if (ctx.qry.path && !prefixcmp(ctx.qry.path, "heads"))
244 cgit_print_branches(0); 244 cgit_print_branches(0);
245 else if (ctx.qry.path && !strncmp(ctx.qry.path, "tags", 4)) 245 else if (ctx.qry.path && !prefixcmp(ctx.qry.path, "tags"))
246 cgit_print_tags(0); 246 cgit_print_tags(0);
247 else { 247 else {
248 cgit_print_branches(0); 248 cgit_print_branches(0);
diff --git a/ui-shared.c b/ui-shared.c
index d32852f..2c12de7 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -120,7 +120,7 @@ const char *cgit_repobasename(const char *reponame)
120 /* strip trailing slashes */ 120 /* strip trailing slashes */
121 while (p && rvbuf[p] == '/') rvbuf[p--] = 0; 121 while (p && rvbuf[p] == '/') rvbuf[p--] = 0;
122 /* strip trailing .git */ 122 /* strip trailing .git */
123 if (p >= 3 && !strncmp(&rvbuf[p-3], ".git", 4)) { 123 if (p >= 3 && !prefixcmp(&rvbuf[p-3], ".git")) {
124 p -= 3; rvbuf[p--] = 0; 124 p -= 3; rvbuf[p--] = 0;
125 } 125 }
126 /* strip more trailing slashes if any */ 126 /* strip more trailing slashes if any */
diff --git a/ui-summary.c b/ui-summary.c
index 3a7c7a7..63a5a75 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -116,7 +116,7 @@ static char* append_readme_path(const char *filename, const char *ref, const cha
116 if (!ref) { 116 if (!ref) {
117 resolved_base = realpath(base_dir, NULL); 117 resolved_base = realpath(base_dir, NULL);
118 resolved_full = realpath(full_path, NULL); 118 resolved_full = realpath(full_path, NULL);
119 if (!resolved_base || !resolved_full || strncmp(resolved_base, resolved_full, strlen(resolved_base))) { 119 if (!resolved_base || !resolved_full || prefixcmp(resolved_full, resolved_base)) {
120 free(full_path); 120 free(full_path);
121 full_path = NULL; 121 full_path = NULL;
122 } 122 }