Changeset 13819

Timestamp:

Jan 21, 2013, 1:26:59 AM (8 years ago)

Author:

jordan

Message:

(libT) update our jsonsl snapshot

Location:

trunk/libtransmission

Files:

• jsonsl.c (modified) (6 diffs)
• jsonsl.h (modified) (12 diffs)

trunk/libtransmission/jsonsl.c

@@ -148 +148 @@
 
 JSONSL_API
-jsonsl_t jsonsl_new(size_t nlevels)
+jsonsl_t jsonsl_new(int nlevels)
 {
     struct jsonsl_st *jsn =
@@ -164 +164 @@
 void jsonsl_reset(jsonsl_t jsn)
 {
-    size_t ii;
+    unsigned int ii;
     jsn->tok_last = 0;
     jsn->can_insert = 1;
@@ -682 +682 @@
         *(c+3) = origc;
 
-        *outp = pctval;
+        *outp = (char) pctval;
         c += 2;
         continue;
@@ -793 +793 @@
 jsonsl_jpr_match(jsonsl_jpr_t jpr,
                    jsonsl_type_t parent_type,
-                   size_t parent_level,
+                   unsigned int parent_level,
                    const char *key,
                    size_t nkey)
@@ -940 +940 @@
 
     if (parent_state->type == JSONSL_T_LIST) {
-        nkey = parent_state->nelem;
+        nkey = (size_t) parent_state->nelem;
     }
 
@@ -1014 +1014 @@
     *err = JSONSL_ERROR_##e; \
     if (errat) { \
-        *errat = (const char*)(c+ (ssize_t)(offset)); \
+        *errat = (const char*)(c+ (ptrdiff_t)(offset)); \
     } \
     return 0;

trunk/libtransmission/jsonsl.h

@@ -38 +38 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <string.h>
 #include <sys/types.h>
@@ -55 +56 @@
 
 /* Stolen from http-parser.h, and possibly others */
-#if defined(_WIN32) && !defined(__MINGW32__) && (!defined(_MSC_VER) || _MSC_VER<1600)
+#if defined(_WIN32) && !defined(__MINGW32__) 
 typedef __int8 int8_t;
 typedef unsigned __int8 uint8_t;
@@ -64 +65 @@
 typedef __int64 int64_t;
 typedef unsigned __int64 uint64_t;
-
+#if !defined(_MSC_VER) || _MSC_VER<1400
 typedef unsigned int size_t;
 typedef int ssize_t;
+#endif
 #else
 #include <stdint.h>
@@ -237 +239 @@
 
 /**
- * A state is a single level of the stack
+ * A state is a single level of the stack.
+ * Non-private data (i.e. the 'data' field, see the STATE_GENERIC section)
+ * will remain in tact until the item is popped.
+ *
+ * As a result, it means a parent state object may be accessed from a child
+ * object, (the parents fields will all be valid). This allows a user to create
+ * an ad-hoc hierarchy on top of the JSON one.
+ *
  */
 struct jsonsl_state_st {
@@ -261 +270 @@
 
     /**
-     * The position at which any immediate child was last POPped
+     * The position at which any immediate child was last POPped.
+     * Note that this field is only set when the item is popped.
      */
     size_t pos_cur;
@@ -271 +281 @@
      * level parameter (though the logic is not that simple)
      */
-    size_t level;
+    unsigned int level;
 
 
@@ -305 +315 @@
     /**
      * Put anything you want here. if JSONSL_STATE_USER_FIELDS is here, then
-     * the macro expansion happens here
+     * the macro expansion happens here.
+     *
+     * You can use these fields to store hierarchical or 'tagging' information
+     * for specific objects.
+     *
+     * See the documentation above for the lifetime of the state object (i.e.
+     * if the private data points to allocated memory, it should be freed
+     * when the object is popped, as the state object will be re-used)
      */
 #ifndef JSONSL_STATE_GENERIC
@@ -392 +409 @@
 
     /** This is the current level of the stack */
-    size_t level;
+    unsigned int level;
 
     /**
@@ -472 +489 @@
     char tok_last;
     int can_insert;
-    size_t levels_max;
+    unsigned int levels_max;
 
 #ifndef JSONSL_NO_JPR
-    unsigned int jpr_count;
+    size_t jpr_count;
     jsonsl_jpr_t *jprs;
 
@@ -498 +515 @@
  */
 JSONSL_API
-jsonsl_t jsonsl_new(size_t nlevels);
+jsonsl_t jsonsl_new(int nlevels);
 
 /**
@@ -698 +715 @@
  * this should be the current index.
  *
+ * NOTE: The key of the child means any kind of associative data related to the
+ * element. Thus: <<< { "foo" : [ >>,
+ * the opening array's key is "foo".
+ *
  * @return a status constant. This indicates whether a match was excluded, possible,
  * or successful.
@@ -704 +725 @@
 jsonsl_jpr_match_t jsonsl_jpr_match(jsonsl_jpr_t jpr,
                                     jsonsl_type_t parent_type,
-                                    size_t parent_level,
+                                    unsigned int parent_level,
                                     const char *key, size_t nkey);