From: "René Scharfe" <l.s.r@web.de>
To: Git List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: [PATCH 2/5] apply: use SWAP macro
Date: Sat, 28 Jan 2017 22:40:06 +0100 [thread overview]
Message-ID: <943fb53f-c602-7c04-ca9a-7d2b1bd68e77@web.de> (raw)
In-Reply-To: <8ef4c833-45bd-6831-0683-6d01f30aa518@web.de>
Use the exported macro SWAP instead of the file-scoped macro swap and
remove the latter's definition.
Signed-off-by: Rene Scharfe <l.s.r@web.de>
---
apply.c | 23 +++++++----------------
1 file changed, 7 insertions(+), 16 deletions(-)
diff --git a/apply.c b/apply.c
index 2ed808d429..0e2caeab9c 100644
--- a/apply.c
+++ b/apply.c
@@ -2187,29 +2187,20 @@ static int parse_chunk(struct apply_state *state, char *buffer, unsigned long si
return offset + hdrsize + patchsize;
}
-#define swap(a,b) myswap((a),(b),sizeof(a))
-
-#define myswap(a, b, size) do { \
- unsigned char mytmp[size]; \
- memcpy(mytmp, &a, size); \
- memcpy(&a, &b, size); \
- memcpy(&b, mytmp, size); \
-} while (0)
-
static void reverse_patches(struct patch *p)
{
for (; p; p = p->next) {
struct fragment *frag = p->fragments;
- swap(p->new_name, p->old_name);
- swap(p->new_mode, p->old_mode);
- swap(p->is_new, p->is_delete);
- swap(p->lines_added, p->lines_deleted);
- swap(p->old_sha1_prefix, p->new_sha1_prefix);
+ SWAP(p->new_name, p->old_name);
+ SWAP(p->new_mode, p->old_mode);
+ SWAP(p->is_new, p->is_delete);
+ SWAP(p->lines_added, p->lines_deleted);
+ SWAP(p->old_sha1_prefix, p->new_sha1_prefix);
for (; frag; frag = frag->next) {
- swap(frag->newpos, frag->oldpos);
- swap(frag->newlines, frag->oldlines);
+ SWAP(frag->newpos, frag->oldpos);
+ SWAP(frag->newlines, frag->oldlines);
}
}
}
--
2.11.0
next prev parent reply other threads:[~2017-01-28 21:40 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-28 21:13 [PATCH 0/5] introduce SWAP macro René Scharfe
2017-01-28 21:38 ` [PATCH 1/5] add " René Scharfe
2017-01-30 15:39 ` Johannes Schindelin
2017-01-30 16:48 ` René Scharfe
2017-01-30 20:48 ` Johannes Schindelin
2017-01-30 21:46 ` René Scharfe
2017-01-31 12:13 ` Johannes Schindelin
2017-01-31 21:02 ` René Scharfe
2017-02-01 0:44 ` Ramsay Jones
2017-02-01 11:39 ` Johannes Schindelin
2017-01-30 16:01 ` Johannes Schindelin
2017-01-30 16:59 ` René Scharfe
2017-01-30 18:41 ` Johannes Sixt
2017-01-30 21:03 ` Johannes Schindelin
2017-01-30 22:09 ` René Scharfe
2017-01-30 22:21 ` Brandon Williams
2017-01-31 21:03 ` René Scharfe
2017-01-31 21:35 ` Jeff King
2017-01-31 22:29 ` Junio C Hamano
2017-01-31 22:36 ` Jeff King
2017-02-01 11:28 ` Johannes Schindelin
2017-02-01 11:47 ` Jeff King
2017-02-01 18:06 ` René Scharfe
2017-02-01 18:33 ` Junio C Hamano
2017-02-07 22:04 ` René Scharfe
2017-02-07 22:30 ` Junio C Hamano
2017-02-08 15:14 ` Johannes Schindelin
2017-01-31 12:03 ` Johannes Schindelin
2017-04-24 11:29 ` Jeff King
2017-04-24 11:49 ` Jeff King
2017-04-24 13:13 ` Duy Nguyen
2017-04-28 17:04 ` René Scharfe
2017-04-28 21:49 ` Jeff King
2017-04-29 18:16 ` René Scharfe
2017-04-30 3:11 ` Jeff King
2017-05-02 5:29 ` René Scharfe
2017-01-28 21:40 ` René Scharfe [this message]
2017-01-28 21:40 ` [PATCH 3/5] use " René Scharfe
2017-01-30 16:03 ` Johannes Schindelin
2017-01-30 17:18 ` René Scharfe
2017-01-30 22:22 ` Junio C Hamano
2017-01-31 21:02 ` René Scharfe
2017-01-28 21:41 ` [PATCH 4/5] diff: " René Scharfe
2017-01-30 16:04 ` Johannes Schindelin
2017-01-30 17:26 ` René Scharfe
2017-01-30 22:22 ` Junio C Hamano
2017-01-28 21:42 ` [PATCH 5/5] graph: " René Scharfe
2017-01-30 16:16 ` Johannes Schindelin
2017-01-30 17:41 ` René Scharfe
2017-01-30 23:20 ` [PATCH 0/5] introduce " Junio C Hamano
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=943fb53f-c602-7c04-ca9a-7d2b1bd68e77@web.de \
--to=l.s.r@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
/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).