git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 4/4] prefixcmp(): fix-up leftover strncmp().

From
Junio C Hamano <junkio@cox.net>
Date
Feb 20, 2007, 09:55 UTC
Message-ID
<7vtzxhw3us.fsf_-_@assigned-by-dhcp.cox.net>
In-Reply-To
<200702200942.18654.andyparkins@gmail.com>

There were instances of strncmp() that were formatted improperly (e.g. whitespace around parameter before closing parenthesis) that caused the earlier mechanical conversion step to miss them. This step cleans them up.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---
 * This concludes the series.  I'll go over these line by line
   tomorrow for the last time, and then will apply them.
 builtin-ls-tree.c     |    2 +-
 builtin-rev-parse.c   |    2 +-
 builtin-show-branch.c |    4 ++--
 diff.c                |    2 +-
 http-fetch.c          |    2 +-
 http-push.c           |    2 +-
 imap-send.c           |    8 ++++----
 revision.c            |    2 +-
 wt-status.c           |    2 +-
 9 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/builtin-ls-tree.c b/builtin-ls-tree.c
index 201defd..6472610 100644
--- a/builtin-ls-tree.c
+++ b/builtin-ls-tree.c
@@ -118,7 +118,7 @@ int cmd_ls_tree(int argc, const char **argv, const char *prefix)
 				chomp_prefix = 0;
 				break;
 			}
-			if (!strncmp(argv[1]+2, "abbrev=",7)) {
+			if (!prefixcmp(argv[1]+2, "abbrev=")) {
 				abbrev = strtoul(argv[1]+9, NULL, 10);
 				if (abbrev && abbrev < MINIMUM_ABBREV)
 					abbrev = MINIMUM_ABBREV;
diff --git a/builtin-rev-parse.c b/builtin-rev-parse.c
index a1c3411..37addb2 100644
--- a/builtin-rev-parse.c
+++ b/builtin-rev-parse.c
@@ -233,7 +233,7 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
 			}
 			continue;
 		}
-		if (!strncmp(arg,"-n",2)) {
+		if (!prefixcmp(arg, "-n")) {
 			if ((filter & DO_FLAGS) && (filter & DO_REVS))
 				show(arg);
 			continue;
diff --git a/builtin-show-branch.c b/builtin-show-branch.c
index 402a8f7..67ae6ba 100644
--- a/builtin-show-branch.c
+++ b/builtin-show-branch.c
@@ -378,7 +378,7 @@ static int append_head_ref(const char *refname, const unsigned char *sha1, int f
 {
 	unsigned char tmp[20];
 	int ofs = 11;
-	if (strncmp(refname, "refs/heads/", ofs))
+	if (prefixcmp(refname, "refs/heads/"))
 		return 0;
 	/* If both heads/foo and tags/foo exists, get_sha1 would
 	 * get confused.
@@ -392,7 +392,7 @@ static int append_remote_ref(const char *refname, const unsigned char *sha1, int
 {
 	unsigned char tmp[20];
 	int ofs = 13;
-	if (strncmp(refname, "refs/remotes/", ofs))
+	if (prefixcmp(refname, "refs/remotes/"))
 		return 0;
 	/* If both heads/foo and tags/foo exists, get_sha1 would
 	 * get confused.
diff --git a/diff.c b/diff.c
index fad13ab..c3afee2 100644
--- a/diff.c
+++ b/diff.c
@@ -77,7 +77,7 @@ int git_diff_ui_config(const char *var, const char *value)
 			diff_detect_rename_default = DIFF_DETECT_RENAME;
 		return 0;
 	}
-	if (!prefixcmp(var, "diff.color.") || !strncmp(var, "color.diff.", 11)) {
+	if (!prefixcmp(var, "diff.color.") || !prefixcmp(var, "color.diff.")) {
 		int slot = parse_diff_color_slot(var, 11);
 		color_parse(value, var, diff_colors[slot]);
 		return 0;
diff --git a/http-fetch.c b/http-fetch.c
index d9a4561..e6cd11d 100644
--- a/http-fetch.c
+++ b/http-fetch.c
@@ -718,7 +718,7 @@ static int fetch_indices(struct alt_base *repo)
 			i++;
 			if (i + 52 <= buffer.posn &&
 			    !prefixcmp(data + i, " pack-") &&
-			    !strncmp(data + i + 46, ".pack\n", 6)) {
+			    !prefixcmp(data + i + 46, ".pack\n")) {
 				get_sha1_hex(data + i + 6, sha1);
 				setup_index(repo, sha1);
 				i += 51;
diff --git a/http-push.c b/http-push.c
index eb77c9a..9ad6fd0 100644
--- a/http-push.c
+++ b/http-push.c
@@ -1061,7 +1061,7 @@ static int fetch_indices(void)
 			i++;
 			if (i + 52 < buffer.posn &&
 			    !prefixcmp(data + i, " pack-") &&
-			    !strncmp(data + i + 46, ".pack\n", 6)) {
+			    !prefixcmp(data + i + 46, ".pack\n")) {
 				get_sha1_hex(data + i + 6, sha1);
 				setup_index(sha1);
 				i += 51;
diff --git a/imap-send.c b/imap-send.c
index 3eaf025..84df2fa 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -1192,7 +1192,7 @@ count_messages( msg_data_t *msg )
 	char *p = msg->data;
 
 	while (1) {
-		if (!strncmp( "From ", p, 5 )) {
+		if (!prefixcmp(p, "From ")) {
 			count++;
 			p += 5;
 		}
@@ -1216,7 +1216,7 @@ split_msg( msg_data_t *all_msgs, msg_data_t *msg, int *ofs )
 	data = &all_msgs->data[ *ofs ];
 	msg->len = all_msgs->len - *ofs;
 
-	if (msg->len < 5 || strncmp( data, "From ", 5 ))
+	if (msg->len < 5 || prefixcmp(data, "From "))
 		return 0;
 
 	p = strchr( data, '\n' );
@@ -1267,12 +1267,12 @@ git_imap_config(const char *key, const char *val)
 		imap_folder = xstrdup( val );
 	} else if (!strcmp( "host", key )) {
 		{
-			if (!strncmp( "imap:", val, 5 ))
+			if (!prefixcmp(val, "imap:"))
 				val += 5;
 			if (!server.port)
 				server.port = 143;
 		}
-		if (!strncmp( "//", val, 2 ))
+		if (!prefixcmp(val, "//"))
 			val += 2;
 		server.host = xstrdup( val );
 	}
diff --git a/revision.c b/revision.c
index abab3b9..622afe3 100644
--- a/revision.c
+++ b/revision.c
@@ -832,7 +832,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
 				revs->max_count = atoi(argv[++i]);
 				continue;
 			}
-			if (!strncmp(arg,"-n",2)) {
+			if (!prefixcmp(arg, "-n")) {
 				revs->max_count = atoi(arg + 2);
 				continue;
 			}
diff --git a/wt-status.c b/wt-status.c
index d17a6ba..035e546 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -344,7 +344,7 @@ int git_status_config(const char *k, const char *v)
 		wt_status_use_color = git_config_colorbool(k, v);
 		return 0;
 	}
-	if (!prefixcmp(k, "status.color.") || !strncmp(k, "color.status.", 13)) {
+	if (!prefixcmp(k, "status.color.") || !prefixcmp(k, "color.status.")) {
 		int slot = parse_status_slot(k, 13);
 		color_parse(v, k, wt_status_colors[slot]);
 	}

-- 
1.5.0.1.571.ge5a1a
Previous: Junio C Hamano
Message 30 of 30 in “Change "refs/" references to symbolic constants”
  1. Change "refs/" references to symbolic constantsAndy Parkins, Feb 19, 2007
  2. Bill LearFeb 19, 2007
  3. Replace literal STRLEN_ #defines in refs.h with compiler evaluated expressionsAndy Parkins, Feb 19, 2007
  4. Krzysztof HalasaFeb 19, 2007
  5. Shawn O. PearceFeb 19, 2007
  6. Junio C HamanoFeb 19, 2007
  7. Shawn O. PearceFeb 19, 2007
  8. Johannes SchindelinFeb 19, 2007
  9. Andy ParkinsFeb 20, 2007
  10. Junio C HamanoFeb 20, 2007
  11. Andy ParkinsFeb 20, 2007
  12. Junio C HamanoFeb 20, 2007
  13. Andy ParkinsFeb 20, 2007
  14. Junio C HamanoFeb 20, 2007
  15. Andy ParkinsFeb 20, 2007
  16. Johannes SchindelinFeb 20, 2007
  17. Simon 'corecode' SchubertFeb 20, 2007
  18. Johannes SchindelinFeb 20, 2007
  19. Andy ParkinsFeb 20, 2007
  20. Nicolas PitreFeb 20, 2007
  21. 1/4 Add prefixcmp()Junio C Hamano, Feb 20, 2007
  22. David KågedalFeb 20, 2007
  23. Junio C HamanoFeb 20, 2007
  24. 2/4 Mechanical conversion to use prefixcmp()Junio C Hamano, Feb 20, 2007
  25. Junio C HamanoFeb 20, 2007
  26. Johannes SchindelinFeb 20, 2007
  27. Junio C HamanoFeb 21, 2007
  28. Johannes SchindelinFeb 21, 2007
  29. 3/4 prefixcmp(): fix-up mechanical conversion.Junio C Hamano, Feb 20, 2007
  30. 4/4 prefixcmp(): fix-up leftover strncmp().Junio C Hamano, Feb 20, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.