Merge tag 'upstream/1.3.0+dfsg'

Upstream version 1.3.0+dfsg

1 files changed, 38 insertions, 37 deletions

diff --git a/src/web_buffer.h b/src/web_buffer.h
index 73533f49..c4cd0563 100644
--- a/src/web_buffer.h
+++ b/src/web_buffer.h
@@ -1,47 +1,43 @@
-#include <stdarg.h>
-#include <time.h>
-#include "storage_number.h"
-
 #ifndef NETDATA_WEB_BUFFER_H
 #define NETDATA_WEB_BUFFER_H 1
 
-#define WEB_DATA_LENGTH_INCREASE_STEP 16384
+#define WEB_DATA_LENGTH_INCREASE_STEP 1024
 
 typedef struct web_buffer {
-	size_t size;		// allocation size of buffer
-	size_t len;		// current data length in buffer
-	char *buffer;	// the buffer
-	uint8_t contenttype;
-	uint8_t options;
-	time_t date;	// the date this content has been generated
+    size_t size;        // allocation size of buffer
+    size_t len;     // current data length in buffer
+    char *buffer;   // the buffer
+    uint8_t contenttype;
+    uint8_t options;
+    time_t date;    // the date this content has been generated
 } BUFFER;
 
 // options
-#define WB_CONTENT_CACHEABLE			1
-#define WB_CONTENT_NO_CACHEABLE			2
+#define WB_CONTENT_CACHEABLE            1
+#define WB_CONTENT_NO_CACHEABLE         2
 
 // content-types
-#define CT_APPLICATION_JSON				1
-#define CT_TEXT_PLAIN					2
-#define CT_TEXT_HTML					3
-#define CT_APPLICATION_X_JAVASCRIPT		4
-#define CT_TEXT_CSS						5
-#define CT_TEXT_XML						6
-#define CT_APPLICATION_XML				7
-#define CT_TEXT_XSL						8
-#define CT_APPLICATION_OCTET_STREAM		9
-#define CT_APPLICATION_X_FONT_TRUETYPE	10
-#define CT_APPLICATION_X_FONT_OPENTYPE	11
-#define CT_APPLICATION_FONT_WOFF		12
-#define CT_APPLICATION_FONT_WOFF2		13
-#define CT_APPLICATION_VND_MS_FONTOBJ	14
-#define CT_IMAGE_SVG_XML				15
-#define CT_IMAGE_PNG					16
-#define CT_IMAGE_JPG					17
-#define CT_IMAGE_GIF					18
-#define CT_IMAGE_XICON					19
-#define CT_IMAGE_ICNS					20
-#define CT_IMAGE_BMP					21
+#define CT_APPLICATION_JSON             1
+#define CT_TEXT_PLAIN                   2
+#define CT_TEXT_HTML                    3
+#define CT_APPLICATION_X_JAVASCRIPT     4
+#define CT_TEXT_CSS                     5
+#define CT_TEXT_XML                     6
+#define CT_APPLICATION_XML              7
+#define CT_TEXT_XSL                     8
+#define CT_APPLICATION_OCTET_STREAM     9
+#define CT_APPLICATION_X_FONT_TRUETYPE  10
+#define CT_APPLICATION_X_FONT_OPENTYPE  11
+#define CT_APPLICATION_FONT_WOFF        12
+#define CT_APPLICATION_FONT_WOFF2       13
+#define CT_APPLICATION_VND_MS_FONTOBJ   14
+#define CT_IMAGE_SVG_XML                15
+#define CT_IMAGE_PNG                    16
+#define CT_IMAGE_JPG                    17
+#define CT_IMAGE_GIF                    18
+#define CT_IMAGE_XICON                  19
+#define CT_IMAGE_ICNS                   20
+#define CT_IMAGE_BMP                    21
 
 #define buffer_strlen(wb) ((wb)->len)
 extern const char *buffer_tostring(BUFFER *wb);
@@ -57,14 +53,19 @@ extern void buffer_rrd_value(BUFFER *wb, calculated_number value);
 extern void buffer_date(BUFFER *wb, int year, int month, int day, int hours, int minutes, int seconds);
 extern void buffer_jsdate(BUFFER *wb, int year, int month, int day, int hours, int minutes, int seconds);
 
-extern BUFFER *buffer_create(long size);
+extern BUFFER *buffer_create(size_t size);
 extern void buffer_free(BUFFER *b);
 extern void buffer_increase(BUFFER *b, size_t free_size_required);
 
-extern void buffer_snprintf(BUFFER *wb, size_t len, const char *fmt, ...);
+extern void buffer_snprintf(BUFFER *wb, size_t len, const char *fmt, ...) __attribute__ (( format (printf, 3, 4)));
 extern void buffer_vsprintf(BUFFER *wb, const char *fmt, va_list args);
-extern void buffer_sprintf(BUFFER *wb, const char *fmt, ...);
+extern void buffer_sprintf(BUFFER *wb, const char *fmt, ...) __attribute__ (( format (printf, 2, 3)));
 
 extern void buffer_char_replace(BUFFER *wb, char from, char to);
 
+extern char *print_number_lu_r(char *str, unsigned long uvalue);
+extern char *print_number_llu_r(char *str, unsigned long long uvalue);
+
+extern void buffer_print_llu(BUFFER *wb, unsigned long long uvalue);
+
 #endif /* NETDATA_WEB_BUFFER_H */