Fossil SCM

Fix several MSVC compiler warnings, including a couple C99-isms.

mistachkin 2012-06-19 13:04 UTC trunk
Commit 80bfcee892392ad1c25961403d126d22b1e6565c
Parent 4006ee4f23609e6…
4 files changed +1 -1 +2 -1 +2 -1 +1 -1
~ src/checkin.c ~ src/json.c ~ src/json_tag.c ~ src/json_wiki.c
M src/checkin.c
+1 -1
--- src/checkin.c
+++ src/checkin.c
@@ -982,11 +982,11 @@
982982
 zBranch = find_option("branch","b",1);
983983
 zColor = find_option("bgcolor",0,1);
984984
 zBrClr = find_option("branchcolor",0,1);
985985
 while( (zTag = find_option("tag",0,1))!=0 ){
986986
 if( zTag[0]==0 ) continue;
987
- azTag = fossil_realloc(azTag, sizeof(char*)*(nTag+2));
987
+ azTag = fossil_realloc((void *)azTag, sizeof(char*)*(nTag+2));
988988
 azTag[nTag++] = zTag;
989989
 azTag[nTag] = 0;
990990
 }
991991
 zComFile = find_option("message-file", "M", 1);
992992
 if( find_option("private",0,0) ){
993993
--- src/checkin.c
+++ src/checkin.c
@@ -982,11 +982,11 @@
982 zBranch = find_option("branch","b",1);
983 zColor = find_option("bgcolor",0,1);
984 zBrClr = find_option("branchcolor",0,1);
985 while( (zTag = find_option("tag",0,1))!=0 ){
986 if( zTag[0]==0 ) continue;
987 azTag = fossil_realloc(azTag, sizeof(char*)*(nTag+2));
988 azTag[nTag++] = zTag;
989 azTag[nTag] = 0;
990 }
991 zComFile = find_option("message-file", "M", 1);
992 if( find_option("private",0,0) ){
993
--- src/checkin.c
+++ src/checkin.c
@@ -982,11 +982,11 @@
982 zBranch = find_option("branch","b",1);
983 zColor = find_option("bgcolor",0,1);
984 zBrClr = find_option("branchcolor",0,1);
985 while( (zTag = find_option("tag",0,1))!=0 ){
986 if( zTag[0]==0 ) continue;
987 azTag = fossil_realloc((void *)azTag, sizeof(char*)*(nTag+2));
988 azTag[nTag++] = zTag;
989 azTag[nTag] = 0;
990 }
991 zComFile = find_option("message-file", "M", 1);
992 if( find_option("private",0,0) ){
993
M src/json.c
+2 -1
--- src/json.c
+++ src/json.c
@@ -1665,12 +1665,13 @@
16651665
 g.json.resultCode = code;
16661666
 if(!fmt || !*fmt){
16671667
 g.zErrMsg = mprintf("%s", json_err_cstr(code));
16681668
 }else{
16691669
 va_list vargs;
1670
+ char * msg;
16701671
 va_start(vargs,fmt);
1671
- char * msg = vmprintf(fmt, vargs);
1672
+ msg = vmprintf(fmt, vargs);
16721673
 va_end(vargs);
16731674
 g.zErrMsg = msg;
16741675
 }
16751676
 return code;
16761677
 }
16771678
--- src/json.c
+++ src/json.c
@@ -1665,12 +1665,13 @@
1665 g.json.resultCode = code;
1666 if(!fmt || !*fmt){
1667 g.zErrMsg = mprintf("%s", json_err_cstr(code));
1668 }else{
1669 va_list vargs;
 
1670 va_start(vargs,fmt);
1671 char * msg = vmprintf(fmt, vargs);
1672 va_end(vargs);
1673 g.zErrMsg = msg;
1674 }
1675 return code;
1676 }
1677
--- src/json.c
+++ src/json.c
@@ -1665,12 +1665,13 @@
1665 g.json.resultCode = code;
1666 if(!fmt || !*fmt){
1667 g.zErrMsg = mprintf("%s", json_err_cstr(code));
1668 }else{
1669 va_list vargs;
1670 char * msg;
1671 va_start(vargs,fmt);
1672 msg = vmprintf(fmt, vargs);
1673 va_end(vargs);
1674 g.zErrMsg = msg;
1675 }
1676 return code;
1677 }
1678
M src/json_tag.c
+2 -1
--- src/json_tag.c
+++ src/json_tag.c
@@ -113,12 +113,13 @@
113113
 : cson_value_null());
114114
 cson_object_set(pay, "propagate", cson_value_new_bool(fPropagate));
115115
 cson_object_set(pay, "raw", cson_value_new_bool(fRaw));
116116
 {
117117
 Blob uu = empty_blob;
118
+ int rc;
118119
 blob_append(&uu, zName, -1);
119
- int const rc = name_to_uuid(&uu, 9, "*");
120
+ rc = name_to_uuid(&uu, 9, "*");
120121
 if(0!=rc){
121122
 json_set_err(FSL_JSON_E_UNKNOWN,"Could not convert name back to UUID!");
122123
 blob_reset(&uu);
123124
 goto error;
124125
 }
125126
--- src/json_tag.c
+++ src/json_tag.c
@@ -113,12 +113,13 @@
113 : cson_value_null());
114 cson_object_set(pay, "propagate", cson_value_new_bool(fPropagate));
115 cson_object_set(pay, "raw", cson_value_new_bool(fRaw));
116 {
117 Blob uu = empty_blob;
 
118 blob_append(&uu, zName, -1);
119 int const rc = name_to_uuid(&uu, 9, "*");
120 if(0!=rc){
121 json_set_err(FSL_JSON_E_UNKNOWN,"Could not convert name back to UUID!");
122 blob_reset(&uu);
123 goto error;
124 }
125
--- src/json_tag.c
+++ src/json_tag.c
@@ -113,12 +113,13 @@
113 : cson_value_null());
114 cson_object_set(pay, "propagate", cson_value_new_bool(fPropagate));
115 cson_object_set(pay, "raw", cson_value_new_bool(fRaw));
116 {
117 Blob uu = empty_blob;
118 int rc;
119 blob_append(&uu, zName, -1);
120 rc = name_to_uuid(&uu, 9, "*");
121 if(0!=rc){
122 json_set_err(FSL_JSON_E_UNKNOWN,"Could not convert name back to UUID!");
123 blob_reset(&uu);
124 goto error;
125 }
126
M src/json_wiki.c
+1 -1
--- src/json_wiki.c
+++ src/json_wiki.c
@@ -107,13 +107,13 @@
107107
 if(0 == contentFormat){
108108
 cson_object_set(pay,"size",
109109
 json_new_int((cson_int_t)(zBody?strlen(zBody):0)));
110110
 }else{
111111
 if( contentFormat>0 ){/*HTML-ize it*/
112
- zFormat = "html";
113112
 Blob content = empty_blob;
114113
 Blob raw = empty_blob;
114
+ zFormat = "html";
115115
 if(zBody && *zBody){
116116
 blob_append(&raw,zBody,-1);
117117
 wiki_convert(&raw,&content,0);
118118
 len = (unsigned int)blob_size(&content);
119119
 }
120120
--- src/json_wiki.c
+++ src/json_wiki.c
@@ -107,13 +107,13 @@
107 if(0 == contentFormat){
108 cson_object_set(pay,"size",
109 json_new_int((cson_int_t)(zBody?strlen(zBody):0)));
110 }else{
111 if( contentFormat>0 ){/*HTML-ize it*/
112 zFormat = "html";
113 Blob content = empty_blob;
114 Blob raw = empty_blob;
 
115 if(zBody && *zBody){
116 blob_append(&raw,zBody,-1);
117 wiki_convert(&raw,&content,0);
118 len = (unsigned int)blob_size(&content);
119 }
120
--- src/json_wiki.c
+++ src/json_wiki.c
@@ -107,13 +107,13 @@
107 if(0 == contentFormat){
108 cson_object_set(pay,"size",
109 json_new_int((cson_int_t)(zBody?strlen(zBody):0)));
110 }else{
111 if( contentFormat>0 ){/*HTML-ize it*/
 
112 Blob content = empty_blob;
113 Blob raw = empty_blob;
114 zFormat = "html";
115 if(zBody && *zBody){
116 blob_append(&raw,zBody,-1);
117 wiki_convert(&raw,&content,0);
118 len = (unsigned int)blob_size(&content);
119 }
120

Keyboard Shortcuts

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