From 36bdb2171f7154fcdf1a24d38c8ce3bd7e448cb1 Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Fri, 10 Jan 2014 12:44:35 +0100 Subject: 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.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'cgit.c') 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) int scan = 0; for (i = 1; i < argc; i++) { - if (!strncmp(argv[i], "--cache=", 8)) { + if (!prefixcmp(argv[i], "--cache=")) { ctx.cfg.cache_root = xstrdup(argv[i] + 8); } if (!strcmp(argv[i], "--nocache")) { @@ -872,28 +872,28 @@ static void cgit_parse_args(int argc, const char **argv) if (!strcmp(argv[i], "--nohttp")) { ctx.env.no_http = "1"; } - if (!strncmp(argv[i], "--query=", 8)) { + if (!prefixcmp(argv[i], "--query=")) { ctx.qry.raw = xstrdup(argv[i] + 8); } - if (!strncmp(argv[i], "--repo=", 7)) { + if (!prefixcmp(argv[i], "--repo=")) { ctx.qry.repo = xstrdup(argv[i] + 7); } - if (!strncmp(argv[i], "--page=", 7)) { + if (!prefixcmp(argv[i], "--page=")) { ctx.qry.page = xstrdup(argv[i] + 7); } - if (!strncmp(argv[i], "--head=", 7)) { + if (!prefixcmp(argv[i], "--head=")) { ctx.qry.head = xstrdup(argv[i] + 7); ctx.qry.has_symref = 1; } - if (!strncmp(argv[i], "--sha1=", 7)) { + if (!prefixcmp(argv[i], "--sha1=")) { ctx.qry.sha1 = xstrdup(argv[i] + 7); ctx.qry.has_sha1 = 1; } - if (!strncmp(argv[i], "--ofs=", 6)) { + if (!prefixcmp(argv[i], "--ofs=")) { ctx.qry.ofs = atoi(argv[i] + 6); } - if (!strncmp(argv[i], "--scan-tree=", 12) || - !strncmp(argv[i], "--scan-path=", 12)) { + if (!prefixcmp(argv[i], "--scan-tree=") || + !prefixcmp(argv[i], "--scan-path=")) { /* HACK: the global snapshot bitmask defines the * set of allowed snapshot formats, but the config * file hasn't been parsed yet so the mask is -- cgit v1.2.3-70-g09d2