From: Brandon Williams <bmwill@google.com>
To: git@vger.kernel.org
Cc: j6t@kdbg.org, avarab@gmail.com, Brandon Williams <bmwill@google.com>
Subject: [PATCH 28/37] trailer: rename 'new' variables
Date: Mon, 29 Jan 2018 14:37:19 -0800 [thread overview]
Message-ID: <20180129223728.30569-29-bmwill@google.com> (raw)
In-Reply-To: <20180129223728.30569-1-bmwill@google.com>
Rename C++ keyword in order to bring the codebase closer to being able
to be compiled with a C++ compiler.
Signed-off-by: Brandon Williams <bmwill@google.com>
---
trailer.c | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/trailer.c b/trailer.c
index 3ba157ed0..5a4a2ecf9 100644
--- a/trailer.c
+++ b/trailer.c
@@ -174,12 +174,12 @@ static void print_all(FILE *outfile, struct list_head *head,
static struct trailer_item *trailer_from_arg(struct arg_item *arg_tok)
{
- struct trailer_item *new = xcalloc(sizeof(*new), 1);
- new->token = arg_tok->token;
- new->value = arg_tok->value;
+ struct trailer_item *new_item = xcalloc(sizeof(*new_item), 1);
+ new_item->token = arg_tok->token;
+ new_item->value = arg_tok->value;
arg_tok->token = arg_tok->value = NULL;
free_arg_item(arg_tok);
- return new;
+ return new_item;
}
static void add_arg_to_input_list(struct trailer_item *on_tok,
@@ -666,30 +666,30 @@ static void parse_trailer(struct strbuf *tok, struct strbuf *val,
static struct trailer_item *add_trailer_item(struct list_head *head, char *tok,
char *val)
{
- struct trailer_item *new = xcalloc(sizeof(*new), 1);
- new->token = tok;
- new->value = val;
- list_add_tail(&new->list, head);
- return new;
+ struct trailer_item *new_item = xcalloc(sizeof(*new_item), 1);
+ new_item->token = tok;
+ new_item->value = val;
+ list_add_tail(&new_item->list, head);
+ return new_item;
}
static void add_arg_item(struct list_head *arg_head, char *tok, char *val,
const struct conf_info *conf,
const struct new_trailer_item *new_trailer_item)
{
- struct arg_item *new = xcalloc(sizeof(*new), 1);
- new->token = tok;
- new->value = val;
- duplicate_conf(&new->conf, conf);
+ struct arg_item *new_item = xcalloc(sizeof(*new_item), 1);
+ new_item->token = tok;
+ new_item->value = val;
+ duplicate_conf(&new_item->conf, conf);
if (new_trailer_item) {
if (new_trailer_item->where != WHERE_DEFAULT)
- new->conf.where = new_trailer_item->where;
+ new_item->conf.where = new_trailer_item->where;
if (new_trailer_item->if_exists != EXISTS_DEFAULT)
- new->conf.if_exists = new_trailer_item->if_exists;
+ new_item->conf.if_exists = new_trailer_item->if_exists;
if (new_trailer_item->if_missing != MISSING_DEFAULT)
- new->conf.if_missing = new_trailer_item->if_missing;
+ new_item->conf.if_missing = new_trailer_item->if_missing;
}
- list_add_tail(&new->list, arg_head);
+ list_add_tail(&new_item->list, arg_head);
}
static void process_command_line_args(struct list_head *arg_head,
--
2.16.0.rc1.238.g530d649a79-goog
next prev parent reply other threads:[~2018-01-29 22:39 UTC|newest]
Thread overview: 89+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-29 22:36 [PATCH 00/37] removal of some c++ keywords Brandon Williams
2018-01-29 22:36 ` [PATCH 01/37] object_info: change member name from 'typename' to 'type_name' Brandon Williams
2018-01-29 22:36 ` [PATCH 02/37] object: rename function " Brandon Williams
2018-01-29 22:36 ` [PATCH 03/37] blame: rename 'this' variables Brandon Williams
2018-01-29 22:36 ` [PATCH 04/37] pack-objects: " Brandon Williams
2018-01-29 22:36 ` [PATCH 05/37] rev-parse: rename 'this' variable Brandon Williams
2018-01-29 22:36 ` [PATCH 06/37] diff: rename 'this' variables Brandon Williams
2018-01-29 22:36 ` [PATCH 07/37] apply: rename 'try' variables Brandon Williams
2018-01-29 22:36 ` [PATCH 08/37] apply: rename 'new' variables Brandon Williams
2018-01-29 22:37 ` [PATCH 09/37] checkout: " Brandon Williams
2018-01-29 22:37 ` [PATCH 10/37] help: " Brandon Williams
2018-01-29 22:37 ` [PATCH 11/37] pack-redundant: " Brandon Williams
2018-01-29 22:37 ` [PATCH 12/37] reflog: " Brandon Williams
2018-01-29 22:37 ` [PATCH 13/37] remote: " Brandon Williams
2018-01-29 22:37 ` [PATCH 14/37] combine-diff: " Brandon Williams
2018-01-29 22:37 ` [PATCH 15/37] commit: " Brandon Williams
2018-01-29 22:37 ` [PATCH 16/37] diff-lib: rename 'new' variable Brandon Williams
2018-01-29 22:37 ` [PATCH 17/37] diff: rename 'new' variables Brandon Williams
2018-01-29 22:37 ` [PATCH 18/37] diffcore-delta: " Brandon Williams
2018-01-29 22:37 ` [PATCH 19/37] entry: " Brandon Williams
2018-01-29 22:37 ` [PATCH 20/37] http: " Brandon Williams
2018-01-29 22:37 ` [PATCH 21/37] imap-send: " Brandon Williams
2018-01-29 22:37 ` [PATCH 22/37] line-log: " Brandon Williams
2018-01-29 22:37 ` [PATCH 23/37] read-cache: " Brandon Williams
2018-01-29 22:37 ` [PATCH 24/37] ref-filter: " Brandon Williams
2018-01-29 22:37 ` [PATCH 25/37] remote: " Brandon Williams
2018-01-29 22:37 ` [PATCH 26/37] split-index: " Brandon Williams
2018-01-29 22:37 ` [PATCH 27/37] submodule: " Brandon Williams
2018-01-29 22:37 ` Brandon Williams [this message]
2018-01-29 22:37 ` [PATCH 29/37] unpack-trees: " Brandon Williams
2018-01-29 22:37 ` [PATCH 30/37] init-db: rename 'template' variables Brandon Williams
2018-01-29 22:37 ` [PATCH 31/37] environment: " Brandon Williams
2018-01-29 22:37 ` [PATCH 32/37] diff: " Brandon Williams
2018-01-29 22:37 ` [PATCH 33/37] environment: rename 'namespace' variables Brandon Williams
2018-01-29 22:37 ` [PATCH 34/37] wrapper: rename 'template' variables Brandon Williams
2018-01-29 22:37 ` [PATCH 35/37] tempfile: " Brandon Williams
2018-01-29 22:37 ` [PATCH 36/37] trailer: " Brandon Williams
2018-01-29 22:37 ` [PATCH 37/37] replace: rename 'new' variables Brandon Williams
2018-01-30 22:58 ` Stefan Beller
2018-01-30 23:21 ` Junio C Hamano
2018-01-30 0:13 ` [PATCH 00/37] removal of some c++ keywords Duy Nguyen
2018-01-30 22:36 ` Junio C Hamano
2018-01-30 23:01 ` Stefan Beller
2018-01-31 0:48 ` Duy Nguyen
2018-01-31 0:57 ` Stefan Beller
2018-01-31 1:05 ` Duy Nguyen
2018-01-30 20:54 ` Johannes Sixt
2018-02-14 18:59 ` [PATCH v2 " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 01/37] object_info: change member name from 'typename' to 'type_name' Brandon Williams
2018-02-14 18:59 ` [PATCH v2 02/37] object: rename function " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 03/37] blame: rename 'this' variables Brandon Williams
2018-02-14 18:59 ` [PATCH v2 04/37] pack-objects: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 05/37] rev-parse: rename 'this' variable Brandon Williams
2018-02-14 18:59 ` [PATCH v2 06/37] diff: rename 'this' variables Brandon Williams
2018-02-14 21:19 ` Junio C Hamano
2018-02-14 21:24 ` Brandon Williams
2018-02-14 18:59 ` [PATCH v2 07/37] apply: rename 'try' variables Brandon Williams
2018-02-14 18:59 ` [PATCH v2 08/37] apply: rename 'new' variables Brandon Williams
2018-02-14 21:40 ` Stefan Beller
2018-02-14 18:59 ` [PATCH v2 09/37] checkout: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 10/37] help: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 11/37] pack-redundant: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 12/37] reflog: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 13/37] remote: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 14/37] combine-diff: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 15/37] commit: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 16/37] diff-lib: rename 'new' variable Brandon Williams
2018-02-14 18:59 ` [PATCH v2 17/37] diff: rename 'new' variables Brandon Williams
2018-02-14 18:59 ` [PATCH v2 18/37] diffcore-delta: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 19/37] entry: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 20/37] http: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 21/37] imap-send: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 22/37] line-log: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 23/37] read-cache: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 24/37] ref-filter: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 25/37] remote: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 26/37] split-index: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 27/37] submodule: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 28/37] trailer: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 29/37] unpack-trees: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 30/37] init-db: rename 'template' variables Brandon Williams
2018-02-14 18:59 ` [PATCH v2 31/37] environment: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 32/37] diff: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 33/37] environment: rename 'namespace' variables Brandon Williams
2018-02-14 18:59 ` [PATCH v2 34/37] wrapper: rename 'template' variables Brandon Williams
2018-02-14 18:59 ` [PATCH v2 35/37] tempfile: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 36/37] trailer: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 37/37] replace: rename 'new' variables Brandon Williams
2018-02-14 22:41 ` [PATCH v2 00/37] removal of some c++ keywords Stefan Beller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180129223728.30569-29-bmwill@google.com \
--to=bmwill@google.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).