short i/o: clean up the naming for the write_{in,or}_xxx family
We recently introduced a write_in_full() which would either write the specified object or emit an error message and fail. In order to fix the read side we now want to introduce a read_in_full() but without an error emit. This patch cleans up the naming of this family of calls: 1) convert the existing write_or_whine() to write_or_whine_pipe() to better indicate its pipe specific nature, 2) convert the existing write_in_full() calls to write_or_whine() to better indicate its nature, 3) introduce a write_in_full() providing a write or fail semantic, and 4) convert write_or_whine() and write_or_whine_pipe() to use write_in_full(). Signed-off-by: Andy Whitcroft <apw@shadowen.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:

committed by
Junio C Hamano

parent
0f018baba6
commit
e08140568a
4
trace.c
4
trace.c
@ -101,7 +101,7 @@ void trace_printf(const char *format, ...)
|
||||
nfvasprintf(&trace_str, format, rest);
|
||||
va_end(rest);
|
||||
|
||||
write_or_whine(fd, trace_str, strlen(trace_str), err_msg);
|
||||
write_or_whine_pipe(fd, trace_str, strlen(trace_str), err_msg);
|
||||
|
||||
free(trace_str);
|
||||
|
||||
@ -139,7 +139,7 @@ void trace_argv_printf(const char **argv, int count, const char *format, ...)
|
||||
strncpy(trace_str + format_len, argv_str, argv_len);
|
||||
strcpy(trace_str + trace_len - 1, "\n");
|
||||
|
||||
write_or_whine(fd, trace_str, trace_len, err_msg);
|
||||
write_or_whine_pipe(fd, trace_str, trace_len, err_msg);
|
||||
|
||||
free(argv_str);
|
||||
free(format_str);
|
||||
|
Reference in New Issue
Block a user