Commit 2c4b7707 by Shawn O. Pearce

Add git__fmt as an easier to use snprintf

Checking the return value of snprintf is a pain, as it must be
>= 0 and < sizeof(buffer).  git__fmt is a simple wrapper to
perform these checks.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
parent 5690f02e
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#endif #endif
#include "cc-compat.h" #include "cc-compat.h"
#include "git/common.h"
#include "util.h" #include "util.h"
#include "thread-utils.h" #include "thread-utils.h"
#include "errors.h" #include "errors.h"
......
#define GIT__NO_HIDE_MALLOC #define GIT__NO_HIDE_MALLOC
#include "common.h" #include "common.h"
#include <stdarg.h>
#include <stdio.h>
void *git__malloc(size_t n) void *git__malloc(size_t n)
{ {
...@@ -25,6 +27,19 @@ char *git__strdup(const char *s) ...@@ -25,6 +27,19 @@ char *git__strdup(const char *s)
return r; return r;
} }
int git__fmt(char *buf, size_t buf_sz, const char *fmt, ...)
{
va_list va;
int r;
va_start(va, fmt);
r = vsnprintf(buf, buf_sz, fmt, va);
va_end(va);
if (r < 0 || r >= buf_sz)
return GIT_ERROR;
return r;
}
int git__prefixcmp(const char *str, const char *prefix) int git__prefixcmp(const char *str, const char *prefix)
{ {
for (;;) { for (;;) {
......
...@@ -26,6 +26,8 @@ extern char *git__strdup(const char *); ...@@ -26,6 +26,8 @@ extern char *git__strdup(const char *);
# define strdup(a) GIT__FORBID_MALLOC # define strdup(a) GIT__FORBID_MALLOC
#endif #endif
extern int git__fmt(char *, size_t, const char *, ...)
GIT_FORMAT_PRINTF(3, 4);
extern int git__prefixcmp(const char *str, const char *prefix); extern int git__prefixcmp(const char *str, const char *prefix);
extern int git__suffixcmp(const char *str, const char *suffix); extern int git__suffixcmp(const char *str, const char *suffix);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment