Skip to content

Commit

Permalink
daemon: mark some strings as const
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jeff King authored and Junio C Hamano committed Jun 18, 2014
1 parent 9e1a5eb commit 1055a89
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions daemon.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ static int strict_paths;
static int export_all_trees;

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

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

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

dir = directory;

Expand All @@ -131,7 +131,7 @@ static const char *path_ok(char *directory)
* "~alice/%s/foo".
*/
int namlen, restlen = strlen(dir);
char *slash = strchr(dir, '/');
const char *slash = strchr(dir, '/');
if (!slash)
slash = dir + restlen;
namlen = slash - dir;
Expand Down Expand Up @@ -253,7 +253,7 @@ static int daemon_error(const char *dir, const char *msg)
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)
{
Expand Down Expand Up @@ -318,7 +318,7 @@ static int run_access_hook(struct daemon_service *service, const char *dir, cons
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;
int enabled = service->enabled;
Expand Down

0 comments on commit 1055a89

Please sign in to comment.