undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

struct ref_update: add a type field

Browse Source 
It used to be that ref_transaction_commit() allocated a temporary
array to hold the types of references while it is working.  Instead,
add a type field to ref_update that ref_transaction_commit() can use
as its scratch space.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty 2014-04-07 15:48:17 +02:00 committed by Junio C Hamano
parent 81c960e4dc
commit 84178db76f
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
refs.c
View File

@ -3279,6 +3279,7 @@ struct ref_update {
int flags; /* REF_NODEREF? */ int flags; /* REF_NODEREF? */
int have_old; /* 1 if old_sha1 is valid, 0 otherwise */ int have_old; /* 1 if old_sha1 is valid, 0 otherwise */
struct ref_lock *lock; struct ref_lock *lock;
int type;
const char refname[FLEX_ARRAY]; const char refname[FLEX_ARRAY];
}; };
@ -3413,7 +3414,6 @@ int ref_transaction_commit(struct ref_transaction *transaction,
{ {
int ret = 0, delnum = 0, i; int ret = 0, delnum = 0, i;
struct ref_update **updates; struct ref_update **updates;
int *types;
const char **delnames; const char **delnames;
int n = transaction->nr; int n = transaction->nr;
@ -3422,7 +3422,6 @@ int ref_transaction_commit(struct ref_transaction *transaction,
/* Allocate work space */ /* Allocate work space */
updates = xmalloc(sizeof(*updates) * n); updates = xmalloc(sizeof(*updates) * n);
types = xmalloc(sizeof(*types) * n);
delnames = xmalloc(sizeof(*delnames) * n); delnames = xmalloc(sizeof(*delnames) * n);
/* Copy, sort, and reject duplicate refs */ /* Copy, sort, and reject duplicate refs */
@ -3440,7 +3439,7 @@ int ref_transaction_commit(struct ref_transaction *transaction,
(update->have_old ? (update->have_old ?
update->old_sha1 : NULL), update->old_sha1 : NULL),
update->flags, update->flags,
&types[i], onerr); &update->type, onerr);
if (!update->lock) { if (!update->lock) {
ret = 1; ret = 1;
goto cleanup; goto cleanup;
@ -3468,7 +3467,7 @@ int ref_transaction_commit(struct ref_transaction *transaction,
if (update->lock) { if (update->lock) {
delnames[delnum++] = update->lock->ref_name; delnames[delnum++] = update->lock->ref_name;
ret |= delete_ref_loose(update->lock, types[i]); ret |= delete_ref_loose(update->lock, update->type);
} }
} }
@ -3482,7 +3481,6 @@ cleanup:
if (updates[i]->lock) if (updates[i]->lock)
unlock_ref(updates[i]->lock); unlock_ref(updates[i]->lock);
free(updates); free(updates);
free(types);
free(delnames); free(delnames);
ref_transaction_free(transaction); ref_transaction_free(transaction);
return ret; return ret;