diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2016-07-26 18:06:10 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-07-26 11:13:44 -0700 |
| commit | 3c8a51e89a90cb2a4016b1c30a10c7245bbdbeda (patch) | |
| tree | 53428d3af58ced88bcd609230593b68ea872e91d /lockfile.c | |
| parent | merge_recursive: abort properly upon errors (diff) | |
| download | tgif-3c8a51e89a90cb2a4016b1c30a10c7245bbdbeda.tar.xz | |
merge-recursive: avoid returning a wholesale struct
It is technically allowed, as per C89, for functions' return type to
be complete structs (i.e. *not* just pointers to structs).
However, it was just an oversight of this developer when converting
Python code to C code in 6d297f8 (Status update on merge-recursive in
C, 2006-07-08) which introduced such a return type.
Besides, by converting this construct to pass in the struct, we can now
start returning a value that can indicate errors in future patches. This
will help the current effort to libify merge-recursive.c.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'lockfile.c')
0 files changed, 0 insertions, 0 deletions