kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

daemon: mark some strings as const 

None of these strings is modified; marking them as const
will help later refactoring.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jeff King 2014-06-18 15:41:58 -04:00 committed by Junio C Hamano
parent 9e1a5ebe52
commit 1055a890f0
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
daemon.c
View File

@ -39,8 +39,8 @@ static int strict_paths;
static int export_all_trees; static int export_all_trees;


/* Take all paths relative to this one if non-NULL */ /* Take all paths relative to this one if non-NULL */
static char *base_path; static const char *base_path;
static char *interpolated_path; static const char *interpolated_path;
static int base_path_relaxed; static int base_path_relaxed;


/* Flag indicating client sent extra args. */ /* Flag indicating client sent extra args. */
@ -106,12 +106,12 @@ static void NORETURN daemon_die(const char *err, va_list params)
exit(1); exit(1);
} }


static const char *path_ok(char *directory) static const char *path_ok(const char *directory)
{ {
static char rpath[PATH_MAX]; static char rpath[PATH_MAX];
static char interp_path[PATH_MAX]; static char interp_path[PATH_MAX];
const char *path; const char *path;
char *dir; const char *dir;


dir = directory; dir = directory;


@ -131,7 +131,7 @@ static const char *path_ok(char *directory)
* "~alice/%s/foo". * "~alice/%s/foo".
*/ */
int namlen, restlen = strlen(dir); int namlen, restlen = strlen(dir);
char *slash = strchr(dir, '/'); const char *slash = strchr(dir, '/');
if (!slash) if (!slash)
slash = dir + restlen; slash = dir + restlen;
namlen = slash - dir; namlen = slash - dir;
@ -253,7 +253,7 @@ static int daemon_error(const char *dir, const char *msg)
return -1; return -1;
} }


static char *access_hook; static const char *access_hook;


static int run_access_hook(struct daemon_service *service, const char *dir, const char *path) static int run_access_hook(struct daemon_service *service, const char *dir, const char *path)
{ {
@ -318,7 +318,7 @@ error_return:
return -1; return -1;
} }


static int run_service(char *dir, struct daemon_service *service) static int run_service(const char *dir, struct daemon_service *service)
{ {
const char *path; const char *path;
int enabled = service->enabled; int enabled = service->enabled;