Fossil SCM

minor cleanups made possible by newer cson APIs.

stephan 2012-07-03 21:30 trunk
Commit 9be377fef1ba390d64100c1ad5ebf1bb8b328317
Parent 5ea759f9fe8e650…
1 file changed +10 -16
~ src/json.c
M src/json.c
+10 -16
--- src/json.c
+++ src/json.c
@@ -989,21 +989,17 @@
989989
 ** _will_ have a JSON type of Array.
990990
 */
991991
 cson_value * json_string_split2( char const * zStr,
992992
 char separator,
993993
 char doDeHttp ){
994
- cson_value * v = cson_value_new_array();
995
- cson_array * a = cson_value_get_array(v);
994
+ cson_array * a = cson_new_array();
996995
 int rc = json_string_split( zStr, separator, doDeHttp, a );
997
- if( 0 == rc ){
998
- cson_value_free(v);
999
- v = NULL;
1000
- }else if(rc<0){
1001
- cson_value_free(v);
1002
- v = NULL;
1003
- }
1004
- return v;
996
+ if( 0>=rc ){
997
+ cson_free_array(a);
998
+ a = NULL;
999
+ }
1000
+ return a ? cson_array_value(a) : NULL;
10051001
 }
10061002
10071003
10081004
 /*
10091005
 ** Performs some common initialization of JSON-related state. Must be
@@ -1829,13 +1825,11 @@
18291825
 /*
18301826
 ** Impl of /json/resultCodes
18311827
 **
18321828
 */
18331829
 cson_value * json_page_resultCodes(){
1834
- cson_value * listV = cson_value_new_array();
1835
- cson_array * list = cson_value_get_array(listV);
1836
- cson_value * objV = NULL;
1830
+ cson_array * list = cson_new_array();
18371831
 cson_object * obj = NULL;
18381832
 cson_string * kRC;
18391833
 cson_string * kSymbol;
18401834
 cson_string * kNumber;
18411835
 cson_string * kDesc;
@@ -1842,16 +1836,16 @@
18421836
 cson_array_reserve( list, 35 );
18431837
 kRC = cson_new_string("resultCode",10);
18441838
 kSymbol = cson_new_string("cSymbol",7);
18451839
 kNumber = cson_new_string("number",6);
18461840
 kDesc = cson_new_string("description",11);
1847
-#define C(K) objV = cson_value_new_object(); obj = cson_value_get_object(objV); \
1841
+#define C(K) obj = cson_new_object(); \
18481842
 cson_object_set_s(obj, kRC, json_new_string(json_rc_cstr(FSL_JSON_E_##K)) ); \
18491843
 cson_object_set_s(obj, kSymbol, json_new_string("FSL_JSON_E_"#K) ); \
18501844
 cson_object_set_s(obj, kNumber, cson_value_new_integer(FSL_JSON_E_##K) ); \
18511845
 cson_object_set_s(obj, kDesc, json_new_string(json_err_cstr(FSL_JSON_E_##K))); \
1852
- cson_array_append( list, objV ); obj = NULL; objV = NULL
1846
+ cson_array_append( list, cson_object_value(obj) ); obj = NULL;
18531847
18541848
 C(GENERIC);
18551849
 C(INVALID_REQUEST);
18561850
 C(UNKNOWN_COMMAND);
18571851
 C(UNKNOWN);
@@ -1888,11 +1882,11 @@
18881882
 C(DB_LOCKED);
18891883
 C(DB_NEEDS_REBUILD);
18901884
 C(DB_NOT_FOUND);
18911885
 C(DB_NOT_VALID);
18921886
 #undef C
1893
- return listV;
1887
+ return cson_array_value(list);
18941888
 }
18951889
18961890
18971891
 /*
18981892
 ** /json/version implementation.
18991893
--- src/json.c
+++ src/json.c
@@ -989,21 +989,17 @@
989 ** _will_ have a JSON type of Array.
990 */
991 cson_value * json_string_split2( char const * zStr,
992 char separator,
993 char doDeHttp ){
994 cson_value * v = cson_value_new_array();
995 cson_array * a = cson_value_get_array(v);
996 int rc = json_string_split( zStr, separator, doDeHttp, a );
997 if( 0 == rc ){
998 cson_value_free(v);
999 v = NULL;
1000 }else if(rc<0){
1001 cson_value_free(v);
1002 v = NULL;
1003 }
1004 return v;
1005 }
1006
1007
1008 /*
1009 ** Performs some common initialization of JSON-related state. Must be
@@ -1829,13 +1825,11 @@
1829 /*
1830 ** Impl of /json/resultCodes
1831 **
1832 */
1833 cson_value * json_page_resultCodes(){
1834 cson_value * listV = cson_value_new_array();
1835 cson_array * list = cson_value_get_array(listV);
1836 cson_value * objV = NULL;
1837 cson_object * obj = NULL;
1838 cson_string * kRC;
1839 cson_string * kSymbol;
1840 cson_string * kNumber;
1841 cson_string * kDesc;
@@ -1842,16 +1836,16 @@
1842 cson_array_reserve( list, 35 );
1843 kRC = cson_new_string("resultCode",10);
1844 kSymbol = cson_new_string("cSymbol",7);
1845 kNumber = cson_new_string("number",6);
1846 kDesc = cson_new_string("description",11);
1847 #define C(K) objV = cson_value_new_object(); obj = cson_value_get_object(objV); \
1848 cson_object_set_s(obj, kRC, json_new_string(json_rc_cstr(FSL_JSON_E_##K)) ); \
1849 cson_object_set_s(obj, kSymbol, json_new_string("FSL_JSON_E_"#K) ); \
1850 cson_object_set_s(obj, kNumber, cson_value_new_integer(FSL_JSON_E_##K) ); \
1851 cson_object_set_s(obj, kDesc, json_new_string(json_err_cstr(FSL_JSON_E_##K))); \
1852 cson_array_append( list, objV ); obj = NULL; objV = NULL
1853
1854 C(GENERIC);
1855 C(INVALID_REQUEST);
1856 C(UNKNOWN_COMMAND);
1857 C(UNKNOWN);
@@ -1888,11 +1882,11 @@
1888 C(DB_LOCKED);
1889 C(DB_NEEDS_REBUILD);
1890 C(DB_NOT_FOUND);
1891 C(DB_NOT_VALID);
1892 #undef C
1893 return listV;
1894 }
1895
1896
1897 /*
1898 ** /json/version implementation.
1899
--- src/json.c
+++ src/json.c
@@ -989,21 +989,17 @@
989 ** _will_ have a JSON type of Array.
990 */
991 cson_value * json_string_split2( char const * zStr,
992 char separator,
993 char doDeHttp ){
994 cson_array * a = cson_new_array();
 
995 int rc = json_string_split( zStr, separator, doDeHttp, a );
996 if( 0>=rc ){
997 cson_free_array(a);
998 a = NULL;
999 }
1000 return a ? cson_array_value(a) : NULL;
 
 
 
1001 }
1002
1003
1004 /*
1005 ** Performs some common initialization of JSON-related state. Must be
@@ -1829,13 +1825,11 @@
1825 /*
1826 ** Impl of /json/resultCodes
1827 **
1828 */
1829 cson_value * json_page_resultCodes(){
1830 cson_array * list = cson_new_array();
 
 
1831 cson_object * obj = NULL;
1832 cson_string * kRC;
1833 cson_string * kSymbol;
1834 cson_string * kNumber;
1835 cson_string * kDesc;
@@ -1842,16 +1836,16 @@
1836 cson_array_reserve( list, 35 );
1837 kRC = cson_new_string("resultCode",10);
1838 kSymbol = cson_new_string("cSymbol",7);
1839 kNumber = cson_new_string("number",6);
1840 kDesc = cson_new_string("description",11);
1841 #define C(K) obj = cson_new_object(); \
1842 cson_object_set_s(obj, kRC, json_new_string(json_rc_cstr(FSL_JSON_E_##K)) ); \
1843 cson_object_set_s(obj, kSymbol, json_new_string("FSL_JSON_E_"#K) ); \
1844 cson_object_set_s(obj, kNumber, cson_value_new_integer(FSL_JSON_E_##K) ); \
1845 cson_object_set_s(obj, kDesc, json_new_string(json_err_cstr(FSL_JSON_E_##K))); \
1846 cson_array_append( list, cson_object_value(obj) ); obj = NULL;
1847
1848 C(GENERIC);
1849 C(INVALID_REQUEST);
1850 C(UNKNOWN_COMMAND);
1851 C(UNKNOWN);
@@ -1888,11 +1882,11 @@
1882 C(DB_LOCKED);
1883 C(DB_NEEDS_REBUILD);
1884 C(DB_NOT_FOUND);
1885 C(DB_NOT_VALID);
1886 #undef C
1887 return cson_array_value(list);
1888 }
1889
1890
1891 /*
1892 ** /json/version implementation.
1893

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button