summaryrefslogtreecommitdiff
path: root/builtin-bundle.c
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2007-03-30 23:07:05 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-03-31 08:11:11 (GMT)
commit46efd2d93ce39fd5c1a91f0a2f918f2d8bbfdf92 (patch)
treee49b5f87de3bd93be27c8cb0ee33cbb7e69f4d11 /builtin-bundle.c
parent86747c132b87fc97bbb134baaffe9ecc12c5a90d (diff)
downloadgit-46efd2d93ce39fd5c1a91f0a2f918f2d8bbfdf92.zip
git-46efd2d93ce39fd5c1a91f0a2f918f2d8bbfdf92.tar.gz
git-46efd2d93ce39fd5c1a91f0a2f918f2d8bbfdf92.tar.bz2
Rename warn() to warning() to fix symbol conflicts on BSD and Mac OS
This fixes a problem reported by Randal Schwartz: >I finally tracked down all the (albeit inconsequential) errors I was getting >on both OpenBSD and OSX. It's the warn() function in usage.c. There's >warn(3) in BSD-style distros. It'd take a "great rename" to change it, but if >someone with better C skills than I have could do that, my linker and I would >appreciate it. It was annoying to me, too, when I was doing some mergetool testing on Mac OS X, so here's a fix. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Cc: "Randal L. Schwartz" <merlyn@stonehenge.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-bundle.c')
-rw-r--r--builtin-bundle.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-bundle.c b/builtin-bundle.c
index 0a9b738..d1635a0 100644
--- a/builtin-bundle.c
+++ b/builtin-bundle.c
@@ -87,7 +87,7 @@ static int read_header(const char *path, struct bundle_header *header) {
if (buffer[len - 1] == '\n')
buffer[len - 1] = '\0';
if (get_sha1_hex(buffer + offset, sha1)) {
- warn("unrecognized header: %s", buffer);
+ warning("unrecognized header: %s", buffer);
continue;
}
delim = buffer[40 + offset];
@@ -268,7 +268,7 @@ static int create_bundle(struct bundle_header *header, const char *path,
* from getting output.
*/
if (!(e->item->flags & SHOWN)) {
- warn("ref '%s' is excluded by the rev-list options",
+ warning("ref '%s' is excluded by the rev-list options",
e->name);
continue;
}