projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Shrink "struct object" a bit
[git.git]
/
http-push.c
diff --git
a/http-push.c
b/http-push.c
index
b39b36b
..
ba64f8f
100644
(file)
--- a/
http-push.c
+++ b/
http-push.c
@@
-1269,8
+1269,8
@@
xml_cdata(void *userData, const XML_Char *s, int len)
struct xml_ctx *ctx = (struct xml_ctx *)userData;
if (ctx->cdata)
free(ctx->cdata);
struct xml_ctx *ctx = (struct xml_ctx *)userData;
if (ctx->cdata)
free(ctx->cdata);
- ctx->cdata = x
calloc(len+1,
1);
- s
trncpy(ctx->cdata, s, len
);
+ ctx->cdata = x
malloc(len +
1);
+ s
afe_strncpy(ctx->cdata, s, len + 1
);
}
static struct remote_lock *lock_remote(char *path, long timeout)
}
static struct remote_lock *lock_remote(char *path, long timeout)
@@
-1472,7
+1472,7
@@
static void process_ls_object(struct remote_ls_ctx *ls)
return;
path += 8;
obj_hex = xmalloc(strlen(path));
return;
path += 8;
obj_hex = xmalloc(strlen(path));
- s
trncpy(obj_hex, path, 2
);
+ s
afe_strncpy(obj_hex, path, 3
);
strcpy(obj_hex + 2, path + 3);
one_remote_object(obj_hex);
free(obj_hex);
strcpy(obj_hex + 2, path + 3);
one_remote_object(obj_hex);
free(obj_hex);
@@
-1773,16
+1773,16
@@
static int get_delta(struct rev_info *revs, struct remote_lock *lock)
if (obj->flags & (UNINTERESTING | SEEN))
continue;
if (obj->flags & (UNINTERESTING | SEEN))
continue;
- if (obj->type ==
tag_type
) {
+ if (obj->type ==
TYPE_TAG
) {
obj->flags |= SEEN;
p = add_object(obj, p, NULL, name);
continue;
}
obj->flags |= SEEN;
p = add_object(obj, p, NULL, name);
continue;
}
- if (obj->type ==
tree_type
) {
+ if (obj->type ==
TYPE_TREE
) {
p = process_tree((struct tree *)obj, p, NULL, name);
continue;
}
p = process_tree((struct tree *)obj, p, NULL, name);
continue;
}
- if (obj->type ==
blob_type
) {
+ if (obj->type ==
TYPE_BLOB
) {
p = process_blob((struct blob *)obj, p, NULL, name);
continue;
}
p = process_blob((struct blob *)obj, p, NULL, name);
continue;
}
@@
-1949,12
+1949,12
@@
static int ref_newer(const unsigned char *new_sha1,
* old. Otherwise we require --force.
*/
o = deref_tag(parse_object(old_sha1), NULL, 0);
* old. Otherwise we require --force.
*/
o = deref_tag(parse_object(old_sha1), NULL, 0);
- if (!o || o->type !=
commit_type
)
+ if (!o || o->type !=
TYPE_COMMIT
)
return 0;
old = (struct commit *) o;
o = deref_tag(parse_object(new_sha1), NULL, 0);
return 0;
old = (struct commit *) o;
o = deref_tag(parse_object(new_sha1), NULL, 0);
- if (!o || o->type !=
commit_type
)
+ if (!o || o->type !=
TYPE_COMMIT
)
return 0;
new = (struct commit *) o;
return 0;
new = (struct commit *) o;
@@
-2033,7
+2033,7
@@
static void add_remote_info_ref(struct remote_ls_ctx *ls)
fwrite_buffer(ref_info, 1, len, buf);
free(ref_info);
fwrite_buffer(ref_info, 1, len, buf);
free(ref_info);
- if (o->type ==
tag_type
) {
+ if (o->type ==
TYPE_TAG
) {
o = deref_tag(o, ls->dentry_name, 0);
if (o) {
len = strlen(ls->dentry_name) + 45;
o = deref_tag(o, ls->dentry_name, 0);
if (o) {
len = strlen(ls->dentry_name) + 45;
@@
-2160,8
+2160,8
@@
static void fetch_symref(char *path, char **symref, unsigned char *sha1)
/* If it's a symref, set the refname; otherwise try for a sha1 */
if (!strncmp((char *)buffer.buffer, "ref: ", 5)) {
/* If it's a symref, set the refname; otherwise try for a sha1 */
if (!strncmp((char *)buffer.buffer, "ref: ", 5)) {
- *symref = x
calloc(buffer.posn - 5, 1
);
- s
trncpy(*symref, (char *)buffer.buffer + 5, buffer.posn - 6
);
+ *symref = x
malloc(buffer.posn - 5
);
+ s
afe_strncpy(*symref, (char *)buffer.buffer + 5, buffer.posn - 5
);
} else {
get_sha1_hex(buffer.buffer, sha1);
}
} else {
get_sha1_hex(buffer.buffer, sha1);
}