diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-03-07 01:54:07 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-03-07 01:54:07 +0300 |
commit | 169c9c0169a00876f699678ac66ebe9563b0c29f (patch) | |
tree | 5344fd15a9134aa92eaf79ff5959f616cceffa17 /http.c | |
parent | c14d5f99cd91347db3978c58c4b24d60ca29af75 (diff) | |
parent | efdfe11f4f1f901db1ebfa7ebda6337293a2e5c5 (diff) |
Merge branch 'bw/c-plus-plus'
Avoid using identifiers that clash with C++ keywords. Even though
it is not a goal to compile Git with C++ compilers, changes like
this help use of code analysis tools that targets C++ on our
codebase.
* bw/c-plus-plus: (37 commits)
replace: rename 'new' variables
trailer: rename 'template' variables
tempfile: rename 'template' variables
wrapper: rename 'template' variables
environment: rename 'namespace' variables
diff: rename 'template' variables
environment: rename 'template' variables
init-db: rename 'template' variables
unpack-trees: rename 'new' variables
trailer: rename 'new' variables
submodule: rename 'new' variables
split-index: rename 'new' variables
remote: rename 'new' variables
ref-filter: rename 'new' variables
read-cache: rename 'new' variables
line-log: rename 'new' variables
imap-send: rename 'new' variables
http: rename 'new' variables
entry: rename 'new' variables
diffcore-delta: rename 'new' variables
...
Diffstat (limited to 'http.c')
-rw-r--r-- | http.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -1260,14 +1260,14 @@ static struct fill_chain *fill_cfg; void add_fill_function(void *data, int (*fill)(void *)) { - struct fill_chain *new = xmalloc(sizeof(*new)); + struct fill_chain *new_fill = xmalloc(sizeof(*new_fill)); struct fill_chain **linkp = &fill_cfg; - new->data = data; - new->fill = fill; - new->next = NULL; + new_fill->data = data; + new_fill->fill = fill; + new_fill->next = NULL; while (*linkp) linkp = &(*linkp)->next; - *linkp = new; + *linkp = new_fill; } void fill_active_slots(void) |