author | Lars Hjemli <hjemli@gmail.com> | 2008-02-16 12:56:09 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-02-16 12:56:09 (UTC) |
commit | d1f3bbe9d22029f45a77bb938c176ccc0c827d46 (patch) (unidiff) | |
tree | 3f1741c012763cbc5485f31377abdd9241fbac6b /shared.c | |
parent | b228d4ff82a65fdcd4a7364759fe36a0bdda5978 (diff) | |
download | cgit-d1f3bbe9d22029f45a77bb938c176ccc0c827d46.zip cgit-d1f3bbe9d22029f45a77bb938c176ccc0c827d46.tar.gz cgit-d1f3bbe9d22029f45a77bb938c176ccc0c827d46.tar.bz2 |
Move cgit_repo into cgit_context
This removes the global variable which is used to keep track of the
currently selected repository, and adds a new variable in the cgit_context
structure.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | shared.c | 61 |
1 files changed, 30 insertions, 31 deletions
@@ -10,4 +10,3 @@ | |||
10 | 10 | ||
11 | struct repolist cgit_repolist; | 11 | struct cgit_repolist cgit_repolist; |
12 | struct repoinfo *cgit_repo; | ||
13 | struct cgit_context ctx; | 12 | struct cgit_context ctx; |
@@ -75,5 +74,5 @@ int chk_non_negative(int result, char *msg) | |||
75 | 74 | ||
76 | struct repoinfo *add_repo(const char *url) | 75 | struct cgit_repo *add_repo(const char *url) |
77 | { | 76 | { |
78 | struct repoinfo *ret; | 77 | struct cgit_repo *ret; |
79 | 78 | ||
@@ -86,3 +85,3 @@ struct repoinfo *add_repo(const char *url) | |||
86 | cgit_repolist.length * | 85 | cgit_repolist.length * |
87 | sizeof(struct repoinfo)); | 86 | sizeof(struct cgit_repo)); |
88 | } | 87 | } |
@@ -105,6 +104,6 @@ struct repoinfo *add_repo(const char *url) | |||
105 | 104 | ||
106 | struct repoinfo *cgit_get_repoinfo(const char *url) | 105 | struct cgit_repo *cgit_get_repoinfo(const char *url) |
107 | { | 106 | { |
108 | int i; | 107 | int i; |
109 | struct repoinfo *repo; | 108 | struct cgit_repo *repo; |
110 | 109 | ||
@@ -181,28 +180,28 @@ void cgit_global_config_cb(const char *name, const char *value) | |||
181 | else if (!strcmp(name, "repo.url")) | 180 | else if (!strcmp(name, "repo.url")) |
182 | cgit_repo = add_repo(value); | 181 | ctx.repo = add_repo(value); |
183 | else if (!strcmp(name, "repo.name")) | 182 | else if (!strcmp(name, "repo.name")) |
184 | cgit_repo->name = xstrdup(value); | 183 | ctx.repo->name = xstrdup(value); |
185 | else if (cgit_repo && !strcmp(name, "repo.path")) | 184 | else if (ctx.repo && !strcmp(name, "repo.path")) |
186 | cgit_repo->path = trim_end(value, '/'); | 185 | ctx.repo->path = trim_end(value, '/'); |
187 | else if (cgit_repo && !strcmp(name, "repo.clone-url")) | 186 | else if (ctx.repo && !strcmp(name, "repo.clone-url")) |
188 | cgit_repo->clone_url = xstrdup(value); | 187 | ctx.repo->clone_url = xstrdup(value); |
189 | else if (cgit_repo && !strcmp(name, "repo.desc")) | 188 | else if (ctx.repo && !strcmp(name, "repo.desc")) |
190 | cgit_repo->desc = xstrdup(value); | 189 | ctx.repo->desc = xstrdup(value); |
191 | else if (cgit_repo && !strcmp(name, "repo.owner")) | 190 | else if (ctx.repo && !strcmp(name, "repo.owner")) |
192 | cgit_repo->owner = xstrdup(value); | 191 | ctx.repo->owner = xstrdup(value); |
193 | else if (cgit_repo && !strcmp(name, "repo.defbranch")) | 192 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) |
194 | cgit_repo->defbranch = xstrdup(value); | 193 | ctx.repo->defbranch = xstrdup(value); |
195 | else if (cgit_repo && !strcmp(name, "repo.snapshots")) | 194 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) |
196 | cgit_repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ | 195 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ |
197 | else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount")) | 196 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) |
198 | cgit_repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); | 197 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
199 | else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount")) | 198 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) |
200 | cgit_repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); | 199 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
201 | else if (cgit_repo && !strcmp(name, "repo.module-link")) | 200 | else if (ctx.repo && !strcmp(name, "repo.module-link")) |
202 | cgit_repo->module_link= xstrdup(value); | 201 | ctx.repo->module_link= xstrdup(value); |
203 | else if (cgit_repo && !strcmp(name, "repo.readme") && value != NULL) { | 202 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { |
204 | if (*value == '/') | 203 | if (*value == '/') |
205 | cgit_repo->readme = xstrdup(value); | 204 | ctx.repo->readme = xstrdup(value); |
206 | else | 205 | else |
207 | cgit_repo->readme = xstrdup(fmt("%s/%s", cgit_repo->path, value)); | 206 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); |
208 | } else if (!strcmp(name, "include")) | 207 | } else if (!strcmp(name, "include")) |
@@ -215,3 +214,3 @@ void cgit_querystring_cb(const char *name, const char *value) | |||
215 | ctx.qry.repo = xstrdup(value); | 214 | ctx.qry.repo = xstrdup(value); |
216 | cgit_repo = cgit_get_repoinfo(value); | 215 | ctx.repo = cgit_get_repoinfo(value); |
217 | } else if (!strcmp(name, "p")) { | 216 | } else if (!strcmp(name, "p")) { |