Make some strings const

Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Timo Hirvonen 2006-06-28 12:04:39 +03:00 committed by Junio C Hamano
parent 66eb64cba6
commit 554fe20d80
11 changed files with 16 additions and 15 deletions

View File

@ -165,7 +165,7 @@ static int handle_subject(char *line)


static int slurp_attr(const char *line, const char *name, char *attr) static int slurp_attr(const char *line, const char *name, char *attr)
{ {
char *ends, *ap = strcasestr(line, name); const char *ends, *ap = strcasestr(line, name);
size_t sz; size_t sz;


if (!ap) { if (!ap) {

View File

@ -329,7 +329,7 @@ int cmd_rev_parse(int argc, const char **argv, char **envp)
dotdot = strstr(arg, ".."); dotdot = strstr(arg, "..");
if (dotdot) { if (dotdot) {
unsigned char end[20]; unsigned char end[20];
char *next = dotdot + 2; const char *next = dotdot + 2;
const char *this = arg; const char *this = arg;
*dotdot = 0; *dotdot = 0;
if (!*next) if (!*next)

View File

@ -543,7 +543,7 @@ static int add_merge_info(enum cmit_fmt fmt, char *buf, const struct commit *com
const char *hex = abbrev const char *hex = abbrev
? find_unique_abbrev(p->object.sha1, abbrev) ? find_unique_abbrev(p->object.sha1, abbrev)
: sha1_to_hex(p->object.sha1); : sha1_to_hex(p->object.sha1);
char *dots = (abbrev && strlen(hex) != 40) ? "..." : ""; const char *dots = (abbrev && strlen(hex) != 40) ? "..." : "";
parent = parent->next; parent = parent->next;


offset += sprintf(buf + offset, " %s%s", hex, dots); offset += sprintf(buf + offset, " %s%s", hex, dots);

View File

@ -330,7 +330,7 @@ static int git_tcp_connect_sock(char *host)
{ {
int sockfd = -1; int sockfd = -1;
char *colon, *end; char *colon, *end;
char *port = STR(DEFAULT_GIT_PORT); const char *port = STR(DEFAULT_GIT_PORT);
struct addrinfo hints, *ai0, *ai; struct addrinfo hints, *ai0, *ai;
int gai; int gai;


@ -525,7 +525,7 @@ static int git_use_proxy(const char *host)
static void git_proxy_connect(int fd[2], static void git_proxy_connect(int fd[2],
const char *prog, char *host, char *path) const char *prog, char *host, char *path)
{ {
char *port = STR(DEFAULT_GIT_PORT); const char *port = STR(DEFAULT_GIT_PORT);
char *colon, *end; char *colon, *end;
int pipefd[2][2]; int pipefd[2][2];
pid_t pid; pid_t pid;

View File

@ -35,7 +35,7 @@ static char *base_path = NULL;
* after ~user/. E.g. a request to git://host/~alice/frotz would * after ~user/. E.g. a request to git://host/~alice/frotz would
* go to /home/alice/pub_git/frotz with --user-path=pub_git. * go to /home/alice/pub_git/frotz with --user-path=pub_git.
*/ */
static char *user_path = NULL; static const char *user_path = NULL;


/* Timeout, and initial timeout */ /* Timeout, and initial timeout */
static unsigned int timeout = 0; static unsigned int timeout = 0;
@ -472,7 +472,7 @@ static void child_handler(int signo)
children_reaped = reaped + 1; children_reaped = reaped + 1;
/* XXX: Custom logging, since we don't wanna getpid() */ /* XXX: Custom logging, since we don't wanna getpid() */
if (verbose) { if (verbose) {
char *dead = ""; const char *dead = "";
if (!WIFEXITED(status) || WEXITSTATUS(status) > 0) if (!WIFEXITED(status) || WEXITSTATUS(status) > 0)
dead = " (with error)"; dead = " (with error)";
if (log_syslog) if (log_syslog)

View File

@ -97,7 +97,7 @@ static int compare_names(const void *_a, const void *_b)
return (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1; return (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1;
} }


static void describe(char *arg, int last_one) static void describe(const char *arg, int last_one)
{ {
unsigned char sha1[20]; unsigned char sha1[20];
struct commit *cmit; struct commit *cmit;

3
git.c
View File

@ -16,7 +16,8 @@


static void prepend_to_path(const char *dir, int len) static void prepend_to_path(const char *dir, int len)
{ {
char *path, *old_path = getenv("PATH"); const char *old_path = getenv("PATH");
char *path;
int path_len = len; int path_len = len;


if (!old_path) if (!old_path)

View File

@ -1274,7 +1274,7 @@ xml_cdata(void *userData, const XML_Char *s, int len)
strlcpy(ctx->cdata, s, len + 1); strlcpy(ctx->cdata, s, len + 1);
} }


static struct remote_lock *lock_remote(char *path, long timeout) static struct remote_lock *lock_remote(const char *path, long timeout)
{ {
struct active_request_slot *slot; struct active_request_slot *slot;
struct slot_results results; struct slot_results results;
@ -2130,7 +2130,7 @@ static int remote_exists(const char *path)
return -1; return -1;
} }


static void fetch_symref(char *path, char **symref, unsigned char *sha1) static void fetch_symref(const char *path, char **symref, unsigned char *sha1)
{ {
char *url; char *url;
struct buffer buffer; struct buffer buffer;

View File

@ -242,7 +242,7 @@ socket_read( Socket_t *sock, char *buf, int len )
} }


static int static int
socket_write( Socket_t *sock, char *buf, int len ) socket_write( Socket_t *sock, const char *buf, int len )
{ {
int n = write( sock->fd, buf, len ); int n = write( sock->fd, buf, len );
if (n != len) { if (n != len) {

View File

@ -343,7 +343,7 @@ static void read_info_alternates(const char * relative_base, int depth)


void prepare_alt_odb(void) void prepare_alt_odb(void)
{ {
char *alt; const char *alt;


alt = getenv(ALTERNATE_DB_ENVIRONMENT); alt = getenv(ALTERNATE_DB_ENVIRONMENT);
if (!alt) alt = ""; if (!alt) alt = "";

View File

@ -95,8 +95,8 @@ static void create_pack_file(void)
int i; int i;
int args; int args;
const char **argv; const char **argv;
const char **p;
char *buf; char *buf;
char **p;


if (create_full_pack) { if (create_full_pack) {
args = 10; args = 10;
@ -441,7 +441,7 @@ static int receive_needs(void)


static int send_ref(const char *refname, const unsigned char *sha1) static int send_ref(const char *refname, const unsigned char *sha1)
{ {
static char *capabilities = "multi_ack thin-pack side-band"; static const char *capabilities = "multi_ack thin-pack side-band";
struct object *o = parse_object(sha1); struct object *o = parse_object(sha1);


if (!o) if (!o)