strncpy, snprintf and vsnprintf changed to strncpyz, snprintfz and vsnprintfz. And sometimes they are not necessary.

1 files changed, 7 insertions, 7 deletions

diff --git a/src/web_buffer.c b/src/web_buffer.c
index 03c473c3d2..1e7e2534f7 100644
--- a/src/web_buffer.c
+++ b/src/web_buffer.c
@@ -53,7 +53,7 @@ void buffer_reset(BUFFER *wb)
 
 const char *buffer_tostring(BUFFER *wb)
 {
-	buffer_need_bytes(wb, (size_t)1);
+	buffer_need_bytes(wb, 1);
 	wb->buffer[wb->len] = '\0';
 
 	buffer_overflow_check(wb);
@@ -78,7 +78,7 @@ void buffer_strcat(BUFFER *wb, const char *txt)
 {
 	if(unlikely(!txt || !*txt)) return;
 
-	buffer_need_bytes(wb, (size_t)(1));
+	buffer_need_bytes(wb, 1);
 
 	char *s = &wb->buffer[wb->len], *end = &wb->buffer[wb->size];
 	long len = wb->len;
@@ -114,12 +114,12 @@ void buffer_snprintf(BUFFER *wb, size_t len, const char *fmt, ...)
 
 	va_list args;
 	va_start(args, fmt);
-	wb->len += vsnprintf(&wb->buffer[wb->len], len+1, fmt, args);
+	wb->len += vsnprintfz(&wb->buffer[wb->len], len, fmt, args);
 	va_end(args);
 
 	buffer_overflow_check(wb);
 
-	// the buffer is \0 terminated by vsnprintf
+	// the buffer is \0 terminated by vsnprintfz
 }
 
 void buffer_vsprintf(BUFFER *wb, const char *fmt, va_list args)
@@ -130,11 +130,11 @@ void buffer_vsprintf(BUFFER *wb, const char *fmt, va_list args)
 
 	size_t len = wb->size - wb->len;
 
-	wb->len += vsnprintf(&wb->buffer[wb->len], len, fmt, args);
+	wb->len += vsnprintfz(&wb->buffer[wb->len], len, fmt, args);
 
 	buffer_overflow_check(wb);
 
-	// the buffer is \0 terminated by vsnprintf
+	// the buffer is \0 terminated by vsnprintfz
 }
 
 void buffer_sprintf(BUFFER *wb, const char *fmt, ...)
@@ -147,7 +147,7 @@ void buffer_sprintf(BUFFER *wb, const char *fmt, ...)
 
 	va_list args;
 	va_start(args, fmt);
-	wrote = (size_t) vsnprintf(&wb->buffer[wb->len], len, fmt, args);
+	wrote = (size_t) vsnprintfz(&wb->buffer[wb->len], len, fmt, args);
 	va_end(args);
 
 	if(unlikely(wrote >= len)) {