development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-13 21:34:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

apply: tighten constness of line buffer

Browse source 
These point into a single line in the patch text we read from
the input, and they are not used to modify it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2012-04-11 14:41:42 -07:00
parent c2066a3eda
commit 26693ba81c
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
builtin/apply.c
View file

@ -1088,7 +1088,7 @@ static const char *stop_at_slash(const char *line, int llen)
* creation or deletion of an empty file. In any of these cases, * creation or deletion of an empty file. In any of these cases,
* both sides are the same name under a/ and b/ respectively. * both sides are the same name under a/ and b/ respectively.
*/ */
static char *git_header_name(char *line, int llen) static char *git_header_name(const char *line, int llen)
{ {
const char *name; const char *name;
const char *second = NULL; const char *second = NULL;
@ -1215,7 +1215,7 @@ static char *git_header_name(char *line, int llen)
} }
/* Verify that we recognize the lines following a git header */ /* Verify that we recognize the lines following a git header */
static int parse_git_header(char *line, int len, unsigned int size, struct patch *patch) static int parse_git_header(const char *line, int len, unsigned int size, struct patch *patch)
{ {
unsigned long offset; unsigned long offset;
@ -1331,7 +1331,7 @@ static int parse_range(const char *line, int len, int offset, const char *expect
return offset + ex; return offset + ex;
} }
static void recount_diff(char *line, int size, struct fragment *fragment) static void recount_diff(const char *line, int size, struct fragment *fragment)
{ {
int oldlines = 0, newlines = 0, ret = 0; int oldlines = 0, newlines = 0, ret = 0;
@ -1385,7 +1385,7 @@ static void recount_diff(char *line, int size, struct fragment *fragment)
* Parse a unified diff fragment header of the * Parse a unified diff fragment header of the
* form "@@ -a,b +c,d @@" * form "@@ -a,b +c,d @@"
*/ */
static int parse_fragment_header(char *line, int len, struct fragment *fragment) static int parse_fragment_header(const char *line, int len, struct fragment *fragment)
{ {
int offset; int offset;
@ -1399,7 +1399,7 @@ static int parse_fragment_header(char *line, int len, struct fragment *fragment)
return offset; return offset;
} }
static int find_header(char *line, unsigned long size, int *hdrsize, struct patch *patch) static int find_header(const char *line, unsigned long size, int *hdrsize, struct patch *patch)
{ {
unsigned long offset, len; unsigned long offset, len;
@ -1511,7 +1511,7 @@ static void check_whitespace(const char *line, int len, unsigned ws_rule)
* between a "---" that is part of a patch, and a "---" that starts * between a "---" that is part of a patch, and a "---" that starts
* the next patch is to look at the line counts.. * the next patch is to look at the line counts..
*/ */
static int parse_fragment(char *line, unsigned long size, static int parse_fragment(const char *line, unsigned long size,
struct patch *patch, struct fragment *fragment) struct patch *patch, struct fragment *fragment)
{ {
int added, deleted; int added, deleted;
@ -1607,7 +1607,7 @@ static int parse_fragment(char *line, unsigned long size,
return offset; return offset;
} }
static int parse_single_patch(char *line, unsigned long size, struct patch *patch) static int parse_single_patch(const char *line, unsigned long size, struct patch *patch)
{ {
unsigned long offset = 0; unsigned long offset = 0;
unsigned long oldlines = 0, newlines = 0, context = 0; unsigned long oldlines = 0, newlines = 0, context = 0;