summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2009-09-12 08:54:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-09-13 08:31:10 (GMT)
commit2b7ca830c6a6e4f0e1722e24973a026b5b867227 (patch)
treefdcc68951d8e3653cfd54e02ca1c0f1742f4c8a6 /cache.h
parent511a3fc116799df5e3b2262f8f6e501ca73ba2fe (diff)
downloadgit-2b7ca830c6a6e4f0e1722e24973a026b5b867227.zip
git-2b7ca830c6a6e4f0e1722e24973a026b5b867227.tar.gz
git-2b7ca830c6a6e4f0e1722e24973a026b5b867227.tar.bz2
use write_str_in_full helper to avoid literal string lengths
In 2d14d65 (Use a clearer style to issue commands to remote helpers, 2009-09-03) I happened to notice two changes like this: - write_in_full(helper->in, "list\n", 5); + + strbuf_addstr(&buf, "list\n"); + write_in_full(helper->in, buf.buf, buf.len); + strbuf_reset(&buf); IMHO, it would be better to define a new function, static inline ssize_t write_str_in_full(int fd, const char *str) { return write_in_full(fd, str, strlen(str)); } and then use it like this: - strbuf_addstr(&buf, "list\n"); - write_in_full(helper->in, buf.buf, buf.len); - strbuf_reset(&buf); + write_str_in_full(helper->in, "list\n"); Thus not requiring the added allocation, and still avoiding the maintenance risk of literal string lengths. These days, compilers are good enough that strlen("literal") imposes no run-time cost. Transformed via this: perl -pi -e \ 's/write_in_full\((.*?), (".*?"), \d+\)/write_str_in_full($1, $2)/'\ $(git grep -l 'write_in_full.*"') Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/cache.h b/cache.h
index 5fad24c..867918d 100644
--- a/cache.h
+++ b/cache.h
@@ -923,13 +923,18 @@ extern const char *git_mailmap_file;
extern void maybe_flush_or_die(FILE *, const char *);
extern int copy_fd(int ifd, int ofd);
extern int copy_file(const char *dst, const char *src, int mode);
-extern ssize_t read_in_full(int fd, void *buf, size_t count);
-extern ssize_t write_in_full(int fd, const void *buf, size_t count);
extern void write_or_die(int fd, const void *buf, size_t count);
extern int write_or_whine(int fd, const void *buf, size_t count, const char *msg);
extern int write_or_whine_pipe(int fd, const void *buf, size_t count, const char *msg);
extern void fsync_or_die(int fd, const char *);
+extern ssize_t read_in_full(int fd, void *buf, size_t count);
+extern ssize_t write_in_full(int fd, const void *buf, size_t count);
+static inline ssize_t write_str_in_full(int fd, const char *str)
+{
+ return write_in_full(fd, str, strlen(str));
+}
+
/* pager.c */
extern void setup_pager(void);
extern const char *pager_program;