Re: [PATCH 1/3] Added generic string handling code.
On Sun, May 20, 2007 at 04:24:29AM CEST, Timo Sirainen wrote:
Show 9 quoted lines
> diff --git a/str.c b/str.c
> new file mode 100644
> index 0000000..d46e7f4
> --- /dev/null
> +++ b/str.c
> @@ -0,0 +1,40 @@
> +#include "str.h"
> +
> +void _str_append(struct string *str, const char *cstr)
Show 11 quoted lines
> +{
> + unsigned int avail = str->size - str->len;
> + unsigned int len = strlen(cstr);
> +
> + if (len >= avail) {
> + len = avail - 1;
> + str->overflowed = 1;
> + }
> + memcpy(str->buf + str->len, cstr, len);
> + str->len += len;
> + str->buf[str->len] = '\0';You can copy len + 1 and avoid this assignment.
> +}
> +
> +void _str_printfa(struct string *str, const char *fmt, ...)
Show 15 quoted lines
> +{
> + unsigned int avail = str->size - str->len;
> + va_list va;
> + int ret;
> +
> + va_start(va, fmt);
> + ret = vsnprintf(str->buf + str->len, avail, fmt, va);
> + if (ret < avail)
> + str->len += ret;
> + else {
> + str->len += avail - 1;
> + str->overflowed = 1;
> + }
> + va_end(va);
> +}--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
Ever try. Ever fail. No matter. // Try again. Fail again. Fail better.
-- Samuel Beckett
Petr Baudis <pasky@suse.cz>