summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdgar Toernig <froese@gmx.de>2005-04-30 16:51:03 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-30 16:51:03 (GMT)
commitae200ee594545be43ed9dfb51c9db8e1a014a8f5 (patch)
tree983166efa5166ecf0667187ffc037f850669afed
parentb6829693676c882ecb0d8ebc0a3a083e5e38131e (diff)
downloadgit-ae200ee594545be43ed9dfb51c9db8e1a014a8f5.zip
git-ae200ee594545be43ed9dfb51c9db8e1a014a8f5.tar.gz
git-ae200ee594545be43ed9dfb51c9db8e1a014a8f5.tar.bz2
[PATCH] compat: replace AF_LOCAL with AF_UNIX
There's no AF_LOCAL in POSIX
-rw-r--r--rsh.c2
-rw-r--r--tag.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/rsh.c b/rsh.c
index af2f47b..2a52e59 100644
--- a/rsh.c
+++ b/rsh.c
@@ -48,7 +48,7 @@ int setup_connection(int *fd_in, int *fd_out, char *remote_prog,
}
}
strcpy(posn, " -");
- if (socketpair(AF_LOCAL, SOCK_STREAM, 0, sv)) {
+ if (socketpair(AF_UNIX, SOCK_STREAM, 0, sv)) {
return error("Couldn't create socket");
}
if (!fork()) {
diff --git a/tag.c b/tag.c
index f079d83..406dba2 100644
--- a/tag.c
+++ b/tag.c
@@ -26,6 +26,10 @@ int parse_tag(struct tag *item)
char type[20];
void *data, *bufptr;
unsigned long size;
+ int typelen, taglen;
+ unsigned char object[20];
+ const char *type_line, *tag_line, *sig_line;
+
if (item->object.parsed)
return 0;
item->object.parsed = 1;
@@ -37,10 +41,6 @@ int parse_tag(struct tag *item)
return error("Object %s not a tag",
sha1_to_hex(item->object.sha1));
- int typelen, taglen;
- unsigned char object[20];
- const char *type_line, *tag_line, *sig_line;
-
if (size < 64)
return -1;
if (memcmp("object ", data, 7) || get_sha1_hex(data + 7, object))