aboutsummaryrefslogtreecommitdiffstats
path: root/ui-snapshot.c
diff options
context:
space:
mode:
authorChristian Hesse2014-05-29 17:35:46 +0200
committerJason A. Donenfeld2014-06-28 15:14:56 +0200
commit79c985e13c10b498c3ea62f4607c2e2a460c3b10 (patch)
treed06ca41cfe2ebb5ff80ae747e38aeaad35734e35 /ui-snapshot.c
parentb431282c91deea24916578395d88084261410968 (diff)
downloadcgit-79c985e13c10b498c3ea62f4607c2e2a460c3b10.tar.gz
cgit-79c985e13c10b498c3ea62f4607c2e2a460c3b10.tar.bz2
cgit-79c985e13c10b498c3ea62f4607c2e2a460c3b10.zip
git: update for git 2.0
prefixcmp() and suffixcmp() have been remove, functionality is now provided by starts_with() and ends_with(). Retrurn values have been changed, so instead of just renaming we have to fix logic. Everything else looks just fine.
Diffstat (limited to 'ui-snapshot.c')
-rw-r--r--ui-snapshot.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui-snapshot.c b/ui-snapshot.c
index 3107b05..ea77eb4 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -99,7 +99,7 @@ static const struct cgit_snapshot_format *get_format(const char *filename)
99 const struct cgit_snapshot_format *fmt; 99 const struct cgit_snapshot_format *fmt;
100 100
101 for (fmt = cgit_snapshot_formats; fmt->suffix; fmt++) { 101 for (fmt = cgit_snapshot_formats; fmt->suffix; fmt++) {
102 if (!suffixcmp(filename, fmt->suffix)) 102 if (ends_with(filename, fmt->suffix))
103 return fmt; 103 return fmt;
104 } 104 }
105 return NULL; 105 return NULL;
@@ -151,7 +151,7 @@ static const char *get_ref_from_filename(const char *url, const char *filename,
151 goto out; 151 goto out;
152 152
153 reponame = cgit_repobasename(url); 153 reponame = cgit_repobasename(url);
154 if (prefixcmp(snapshot.buf, reponame) == 0) { 154 if (starts_with(snapshot.buf, reponame)) {
155 const char *new_start = snapshot.buf; 155 const char *new_start = snapshot.buf;
156 new_start += strlen(reponame); 156 new_start += strlen(reponame);
157 while (new_start && (*new_start == '-' || *new_start == '_')) 157 while (new_start && (*new_start == '-' || *new_start == '_'))