Fossil SCM

One compile fix and MSVC build fix, from Jeff Slutter.

stephan 2011-09-18 19:11 UTC json
Commit 5f3a98ae83057a2d7102590871fc3cd0d96ea22e
Parent 52229655df3272f…
2 files changed +1 -1 +6 -3
~ src/json.c ~ win/Makefile.msc
M src/json.c
+1 -1
--- src/json.c
+++ src/json.c
@@ -958,12 +958,12 @@
958958
 enum { SeedBufLen = 100 /* in some JSON tests i once actually got an
959959
 80-digit number.
960960
 */
961961
 };
962962
 static char seedBuffer[SeedBufLen];
963
- seedBuffer[0] = 0;
964963
 cson_value const * jseed = json_getenv("anonymousSeed");
964
+ seedBuffer[0] = 0;
965965
 if( !jseed ){
966966
 jseed = json_payload_property("anonymousSeed");
967967
 if( !jseed ){
968968
 jseed = json_getenv("cs") /* name used by HTML interface */;
969969
 }
970970
--- src/json.c
+++ src/json.c
@@ -958,12 +958,12 @@
958 enum { SeedBufLen = 100 /* in some JSON tests i once actually got an
959 80-digit number.
960 */
961 };
962 static char seedBuffer[SeedBufLen];
963 seedBuffer[0] = 0;
964 cson_value const * jseed = json_getenv("anonymousSeed");
 
965 if( !jseed ){
966 jseed = json_payload_property("anonymousSeed");
967 if( !jseed ){
968 jseed = json_getenv("cs") /* name used by HTML interface */;
969 }
970
--- src/json.c
+++ src/json.c
@@ -958,12 +958,12 @@
958 enum { SeedBufLen = 100 /* in some JSON tests i once actually got an
959 80-digit number.
960 */
961 };
962 static char seedBuffer[SeedBufLen];
 
963 cson_value const * jseed = json_getenv("anonymousSeed");
964 seedBuffer[0] = 0;
965 if( !jseed ){
966 jseed = json_payload_property("anonymousSeed");
967 if( !jseed ){
968 jseed = json_getenv("cs") /* name used by HTML interface */;
969 }
970
M win/Makefile.msc
+6 -3
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -38,11 +38,11 @@
3838
3939
 SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 /DSQLITE_THREADSAFE=0 /DSQLITE_DEFAULT_FILE_FORMAT=4 /DSQLITE_ENABLE_STAT3 /Dlocaltime=fossil_localtime /DSQLITE_ENABLE_LOCKING_STYLE=0
4040
4141
 SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c leaf_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c
4242
43
-OBJ = $(OX)\add$O $(OX)\allrepo$O $(OX)\attach$O $(OX)\bag$O $(OX)\bisect$O $(OX)\blob$O $(OX)\branch$O $(OX)\browse$O $(OX)\captcha$O $(OX)\cgi$O $(OX)\checkin$O $(OX)\checkout$O $(OX)\clearsign$O $(OX)\clone$O $(OX)\comformat$O $(OX)\configure$O $(OX)\content$O $(OX)\db$O $(OX)\delta$O $(OX)\deltacmd$O $(OX)\descendants$O $(OX)\diff$O $(OX)\diffcmd$O $(OX)\doc$O $(OX)\encode$O $(OX)\event$O $(OX)\export$O $(OX)\file$O $(OX)\finfo$O $(OX)\glob$O $(OX)\graph$O $(OX)\gzip$O $(OX)\http$O $(OX)\http_socket$O $(OX)\http_ssl$O $(OX)\http_transport$O $(OX)\import$O $(OX)\info$O $(OX)\json$O $(OX)\leaf$O $(OX)\login$O $(OX)\main$O $(OX)\manifest$O $(OX)\md5$O $(OX)\merge$O $(OX)\merge3$O $(OX)\name$O $(OX)\path$O $(OX)\pivot$O $(OX)\popen$O $(OX)\pqueue$O $(OX)\printf$O $(OX)\rebuild$O $(OX)\report$O $(OX)\rss$O $(OX)\schema$O $(OX)\search$O $(OX)\setup$O $(OX)\sha1$O $(OX)\shun$O $(OX)\skins$O $(OX)\sqlcmd$O $(OX)\stash$O $(OX)\stat$O $(OX)\style$O $(OX)\sync$O $(OX)\tag$O $(OX)\tar$O $(OX)\th_main$O $(OX)\timeline$O $(OX)\tkt$O $(OX)\tktsetup$O $(OX)\undo$O $(OX)\update$O $(OX)\url$O $(OX)\user$O $(OX)\verify$O $(OX)\vfile$O $(OX)\wiki$O $(OX)\wikiformat$O $(OX)\winhttp$O $(OX)\xfer$O $(OX)\zip$O $(OX)\shell$O $(OX)\sqlite3$O $(OX)\th$O $(OX)\th_lang$O
43
+OBJ = $(OX)\add$O $(OX)\allrepo$O $(OX)\attach$O $(OX)\bag$O $(OX)\bisect$O $(OX)\blob$O $(OX)\branch$O $(OX)\browse$O $(OX)\captcha$O $(OX)\cgi$O $(OX)\checkin$O $(OX)\checkout$O $(OX)\clearsign$O $(OX)\clone$O $(OX)\comformat$O $(OX)\configure$O $(OX)\content$O $(OX)\db$O $(OX)\delta$O $(OX)\deltacmd$O $(OX)\descendants$O $(OX)\diff$O $(OX)\diffcmd$O $(OX)\doc$O $(OX)\encode$O $(OX)\event$O $(OX)\export$O $(OX)\file$O $(OX)\finfo$O $(OX)\glob$O $(OX)\graph$O $(OX)\gzip$O $(OX)\http$O $(OX)\http_socket$O $(OX)\http_ssl$O $(OX)\http_transport$O $(OX)\import$O $(OX)\info$O $(OX)\json$O $(OX)\leaf$O $(OX)\login$O $(OX)\main$O $(OX)\manifest$O $(OX)\md5$O $(OX)\merge$O $(OX)\merge3$O $(OX)\name$O $(OX)\path$O $(OX)\pivot$O $(OX)\popen$O $(OX)\pqueue$O $(OX)\printf$O $(OX)\rebuild$O $(OX)\report$O $(OX)\rss$O $(OX)\schema$O $(OX)\search$O $(OX)\setup$O $(OX)\sha1$O $(OX)\shun$O $(OX)\skins$O $(OX)\sqlcmd$O $(OX)\stash$O $(OX)\stat$O $(OX)\style$O $(OX)\sync$O $(OX)\tag$O $(OX)\tar$O $(OX)\th_main$O $(OX)\timeline$O $(OX)\tkt$O $(OX)\tktsetup$O $(OX)\undo$O $(OX)\update$O $(OX)\url$O $(OX)\user$O $(OX)\verify$O $(OX)\vfile$O $(OX)\wiki$O $(OX)\wikiformat$O $(OX)\winhttp$O $(OX)\xfer$O $(OX)\zip$O $(OX)\shell$O $(OX)\sqlite3$O $(OX)\th$O $(OX)\th_lang$O $(OX)\cson_amalgamation$O
4444
4545
4646
 APPNAME = $(OX)\fossil$(E)
4747
4848
 all: $(OX) $(APPNAME)
@@ -67,10 +67,11 @@
6767
 echo $(OX)\clearsign.obj >> $@
6868
 echo $(OX)\clone.obj >> $@
6969
 echo $(OX)\comformat.obj >> $@
7070
 echo $(OX)\configure.obj >> $@
7171
 echo $(OX)\content.obj >> $@
72
+ echo $(OX)\cson_amalgamation.obj >> $@
7273
 echo $(OX)\db.obj >> $@
7374
 echo $(OX)\delta.obj >> $@
7475
 echo $(OX)\deltacmd.obj >> $@
7576
 echo $(OX)\descendants.obj >> $@
7677
 echo $(OX)\diff.obj >> $@
@@ -168,15 +169,17 @@
168169
 $(OX)\th$O : $(SRCDIR)\th.c
169170
 $(TCC) /Fo$@ -c $**
170171
171172
 $(OX)\th_lang$O : $(SRCDIR)\th_lang.c
172173
 $(TCC) /Fo$@ -c $**
174
+
175
+$(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
176
+ $(TCC) /Fo$@ -c $**
177
+
173178
174179
 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
175180
 $** > $@
176
-$(OBJDIR)\cson_amalgamation.h : $(SRCDIR)\cson_amalgamation.h
177
- cp $(SRCDIR)\cson_amalgamation.h $@
178181
179182
 page_index.h: mkindex$E $(SRC)
180183
 $** > $@
181184
182185
 clean:
183186
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -38,11 +38,11 @@
38
39 SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 /DSQLITE_THREADSAFE=0 /DSQLITE_DEFAULT_FILE_FORMAT=4 /DSQLITE_ENABLE_STAT3 /Dlocaltime=fossil_localtime /DSQLITE_ENABLE_LOCKING_STYLE=0
40
41 SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c leaf_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c
42
43 OBJ = $(OX)\add$O $(OX)\allrepo$O $(OX)\attach$O $(OX)\bag$O $(OX)\bisect$O $(OX)\blob$O $(OX)\branch$O $(OX)\browse$O $(OX)\captcha$O $(OX)\cgi$O $(OX)\checkin$O $(OX)\checkout$O $(OX)\clearsign$O $(OX)\clone$O $(OX)\comformat$O $(OX)\configure$O $(OX)\content$O $(OX)\db$O $(OX)\delta$O $(OX)\deltacmd$O $(OX)\descendants$O $(OX)\diff$O $(OX)\diffcmd$O $(OX)\doc$O $(OX)\encode$O $(OX)\event$O $(OX)\export$O $(OX)\file$O $(OX)\finfo$O $(OX)\glob$O $(OX)\graph$O $(OX)\gzip$O $(OX)\http$O $(OX)\http_socket$O $(OX)\http_ssl$O $(OX)\http_transport$O $(OX)\import$O $(OX)\info$O $(OX)\json$O $(OX)\leaf$O $(OX)\login$O $(OX)\main$O $(OX)\manifest$O $(OX)\md5$O $(OX)\merge$O $(OX)\merge3$O $(OX)\name$O $(OX)\path$O $(OX)\pivot$O $(OX)\popen$O $(OX)\pqueue$O $(OX)\printf$O $(OX)\rebuild$O $(OX)\report$O $(OX)\rss$O $(OX)\schema$O $(OX)\search$O $(OX)\setup$O $(OX)\sha1$O $(OX)\shun$O $(OX)\skins$O $(OX)\sqlcmd$O $(OX)\stash$O $(OX)\stat$O $(OX)\style$O $(OX)\sync$O $(OX)\tag$O $(OX)\tar$O $(OX)\th_main$O $(OX)\timeline$O $(OX)\tkt$O $(OX)\tktsetup$O $(OX)\undo$O $(OX)\update$O $(OX)\url$O $(OX)\user$O $(OX)\verify$O $(OX)\vfile$O $(OX)\wiki$O $(OX)\wikiformat$O $(OX)\winhttp$O $(OX)\xfer$O $(OX)\zip$O $(OX)\shell$O $(OX)\sqlite3$O $(OX)\th$O $(OX)\th_lang$O
44
45
46 APPNAME = $(OX)\fossil$(E)
47
48 all: $(OX) $(APPNAME)
@@ -67,10 +67,11 @@
67 echo $(OX)\clearsign.obj >> $@
68 echo $(OX)\clone.obj >> $@
69 echo $(OX)\comformat.obj >> $@
70 echo $(OX)\configure.obj >> $@
71 echo $(OX)\content.obj >> $@
 
72 echo $(OX)\db.obj >> $@
73 echo $(OX)\delta.obj >> $@
74 echo $(OX)\deltacmd.obj >> $@
75 echo $(OX)\descendants.obj >> $@
76 echo $(OX)\diff.obj >> $@
@@ -168,15 +169,17 @@
168 $(OX)\th$O : $(SRCDIR)\th.c
169 $(TCC) /Fo$@ -c $**
170
171 $(OX)\th_lang$O : $(SRCDIR)\th_lang.c
172 $(TCC) /Fo$@ -c $**
 
 
 
 
173
174 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
175 $** > $@
176 $(OBJDIR)\cson_amalgamation.h : $(SRCDIR)\cson_amalgamation.h
177 cp $(SRCDIR)\cson_amalgamation.h $@
178
179 page_index.h: mkindex$E $(SRC)
180 $** > $@
181
182 clean:
183
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -38,11 +38,11 @@
38
39 SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 /DSQLITE_THREADSAFE=0 /DSQLITE_DEFAULT_FILE_FORMAT=4 /DSQLITE_ENABLE_STAT3 /Dlocaltime=fossil_localtime /DSQLITE_ENABLE_LOCKING_STYLE=0
40
41 SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c leaf_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c
42
43 OBJ = $(OX)\add$O $(OX)\allrepo$O $(OX)\attach$O $(OX)\bag$O $(OX)\bisect$O $(OX)\blob$O $(OX)\branch$O $(OX)\browse$O $(OX)\captcha$O $(OX)\cgi$O $(OX)\checkin$O $(OX)\checkout$O $(OX)\clearsign$O $(OX)\clone$O $(OX)\comformat$O $(OX)\configure$O $(OX)\content$O $(OX)\db$O $(OX)\delta$O $(OX)\deltacmd$O $(OX)\descendants$O $(OX)\diff$O $(OX)\diffcmd$O $(OX)\doc$O $(OX)\encode$O $(OX)\event$O $(OX)\export$O $(OX)\file$O $(OX)\finfo$O $(OX)\glob$O $(OX)\graph$O $(OX)\gzip$O $(OX)\http$O $(OX)\http_socket$O $(OX)\http_ssl$O $(OX)\http_transport$O $(OX)\import$O $(OX)\info$O $(OX)\json$O $(OX)\leaf$O $(OX)\login$O $(OX)\main$O $(OX)\manifest$O $(OX)\md5$O $(OX)\merge$O $(OX)\merge3$O $(OX)\name$O $(OX)\path$O $(OX)\pivot$O $(OX)\popen$O $(OX)\pqueue$O $(OX)\printf$O $(OX)\rebuild$O $(OX)\report$O $(OX)\rss$O $(OX)\schema$O $(OX)\search$O $(OX)\setup$O $(OX)\sha1$O $(OX)\shun$O $(OX)\skins$O $(OX)\sqlcmd$O $(OX)\stash$O $(OX)\stat$O $(OX)\style$O $(OX)\sync$O $(OX)\tag$O $(OX)\tar$O $(OX)\th_main$O $(OX)\timeline$O $(OX)\tkt$O $(OX)\tktsetup$O $(OX)\undo$O $(OX)\update$O $(OX)\url$O $(OX)\user$O $(OX)\verify$O $(OX)\vfile$O $(OX)\wiki$O $(OX)\wikiformat$O $(OX)\winhttp$O $(OX)\xfer$O $(OX)\zip$O $(OX)\shell$O $(OX)\sqlite3$O $(OX)\th$O $(OX)\th_lang$O $(OX)\cson_amalgamation$O
44
45
46 APPNAME = $(OX)\fossil$(E)
47
48 all: $(OX) $(APPNAME)
@@ -67,10 +67,11 @@
67 echo $(OX)\clearsign.obj >> $@
68 echo $(OX)\clone.obj >> $@
69 echo $(OX)\comformat.obj >> $@
70 echo $(OX)\configure.obj >> $@
71 echo $(OX)\content.obj >> $@
72 echo $(OX)\cson_amalgamation.obj >> $@
73 echo $(OX)\db.obj >> $@
74 echo $(OX)\delta.obj >> $@
75 echo $(OX)\deltacmd.obj >> $@
76 echo $(OX)\descendants.obj >> $@
77 echo $(OX)\diff.obj >> $@
@@ -168,15 +169,17 @@
169 $(OX)\th$O : $(SRCDIR)\th.c
170 $(TCC) /Fo$@ -c $**
171
172 $(OX)\th_lang$O : $(SRCDIR)\th_lang.c
173 $(TCC) /Fo$@ -c $**
174
175 $(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
176 $(TCC) /Fo$@ -c $**
177
178
179 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
180 $** > $@
 
 
181
182 page_index.h: mkindex$E $(SRC)
183 $** > $@
184
185 clean:
186

Keyboard Shortcuts

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