Add lots of tests for pack/unpack code, fix bugs found

[jansson.git] / src / error.c

diff --git a/src/error.c b/src/error.c
index b8c78db..074a68e 100644 (file)
--- a/src/error.c
+++ b/src/error.c
@@ -1,6 +1,4 @@
 #include <string.h>
-#include <stdarg.h>
-
 #include "jansson_private.h"
 
 void jsonp_error_init(json_error_t *error, const char *source)
@@ -10,17 +8,42 @@ void jsonp_error_init(json_error_t *error, const char *source)
         error->text[0] = '\0';
         error->line = -1;
         error->column = -1;
+        error->position = 0;
+        if(source)
+            jsonp_error_set_source(error, source);
+        else
+            error->source[0] = '\0';
+    }
+}
 
-        strncpy(error->source, source, JSON_ERROR_SOURCE_LENGTH);
-        error->source[JSON_ERROR_SOURCE_LENGTH - 1] = '\0';
+void jsonp_error_set_source(json_error_t *error, const char *source)
+{
+    if(!error || !source)
+        return;
+
+    size_t length = strlen(source);
+    if(length < JSON_ERROR_SOURCE_LENGTH)
+        strcpy(error->source, source);
+    else {
+        size_t extra = length - JSON_ERROR_SOURCE_LENGTH + 4;
+        strcpy(error->source, "...");
+        strcpy(error->source + 3, source + extra);
     }
 }
 
 void jsonp_error_set(json_error_t *error, int line, int column,
-                     const char *msg, ...)
+                     size_t position, const char *msg, ...)
 {
     va_list ap;
 
+    va_start(ap, msg);
+    jsonp_error_vset(error, line, column, position, msg, ap);
+    va_end(ap);
+}
+
+void jsonp_error_vset(json_error_t *error, int line, int column,
+                      size_t position, const char *msg, va_list ap)
+{
     if(!error)
         return;
 
@@ -31,8 +54,7 @@ void jsonp_error_set(json_error_t *error, int line, int column,
 
     error->line = line;
     error->column = column;
+    error->position = position;
 
-    va_start(ap, msg);
     vsnprintf(error->text, JSON_ERROR_TEXT_LENGTH, msg, ap);
-    va_end(ap);
 }