Fossil SCM

merge compiler fix for msvc..

mgagnon 2015-02-22 15:59 UTC svn-import_no-svn-rev merge
Commit 44686ca1a92eb13f859b94a244ebad27e43efb1a
Parent 936ebe677bd055a…
2 files changed +11 -7 +11 -7
~ src/import.c ~ src/import.c
M src/import.c
+11 -7
--- src/import.c
+++ src/import.c
@@ -1091,18 +1091,22 @@
10911091
 fossil_fatal("Invalid svndiff0 format");
10921092
 }
10931093
 zDiff += 4;
10941094
 blob_zero(pOut);
10951095
 while( zDiff<(blob_buffer(pDiff)+blob_size(pDiff)) ){
1096
+ u64 lenOut, lenInst, lenData, lenOld;
1097
+ const char *zInst;
1098
+ const char *zData;
1099
+
10961100
 u64 offSrc = svn_get_varint(&zDiff);
1097
- /*u64 lenSrc =*/ svn_get_varint(&zDiff);
1098
- u64 lenOut = svn_get_varint(&zDiff);
1099
- u64 lenInst = svn_get_varint(&zDiff);
1100
- u64 lenData = svn_get_varint(&zDiff);
1101
- const char *zInst = zDiff;
1102
- const char *zData = zInst+lenInst;
1103
- u64 lenOld = blob_size(pOut);
1101
+ /*lenSrc =*/ svn_get_varint(&zDiff);
1102
+ lenOut = svn_get_varint(&zDiff);
1103
+ lenInst = svn_get_varint(&zDiff);
1104
+ lenData = svn_get_varint(&zDiff);
1105
+ zInst = zDiff;
1106
+ zData = zInst+lenInst;
1107
+ lenOld = blob_size(pOut);
11041108
 blob_resize(pOut, lenOut+lenOld);
11051109
 zOut = blob_buffer(pOut)+lenOld;
11061110
 while( zDiff<zInst+lenInst ){
11071111
 u64 lenCpy = (*zDiff)&0x3f;
11081112
 const char *zCpy;
11091113
--- src/import.c
+++ src/import.c
@@ -1091,18 +1091,22 @@
1091 fossil_fatal("Invalid svndiff0 format");
1092 }
1093 zDiff += 4;
1094 blob_zero(pOut);
1095 while( zDiff<(blob_buffer(pDiff)+blob_size(pDiff)) ){
 
 
 
 
1096 u64 offSrc = svn_get_varint(&zDiff);
1097 /*u64 lenSrc =*/ svn_get_varint(&zDiff);
1098 u64 lenOut = svn_get_varint(&zDiff);
1099 u64 lenInst = svn_get_varint(&zDiff);
1100 u64 lenData = svn_get_varint(&zDiff);
1101 const char *zInst = zDiff;
1102 const char *zData = zInst+lenInst;
1103 u64 lenOld = blob_size(pOut);
1104 blob_resize(pOut, lenOut+lenOld);
1105 zOut = blob_buffer(pOut)+lenOld;
1106 while( zDiff<zInst+lenInst ){
1107 u64 lenCpy = (*zDiff)&0x3f;
1108 const char *zCpy;
1109
--- src/import.c
+++ src/import.c
@@ -1091,18 +1091,22 @@
1091 fossil_fatal("Invalid svndiff0 format");
1092 }
1093 zDiff += 4;
1094 blob_zero(pOut);
1095 while( zDiff<(blob_buffer(pDiff)+blob_size(pDiff)) ){
1096 u64 lenOut, lenInst, lenData, lenOld;
1097 const char *zInst;
1098 const char *zData;
1099
1100 u64 offSrc = svn_get_varint(&zDiff);
1101 /*lenSrc =*/ svn_get_varint(&zDiff);
1102 lenOut = svn_get_varint(&zDiff);
1103 lenInst = svn_get_varint(&zDiff);
1104 lenData = svn_get_varint(&zDiff);
1105 zInst = zDiff;
1106 zData = zInst+lenInst;
1107 lenOld = blob_size(pOut);
1108 blob_resize(pOut, lenOut+lenOld);
1109 zOut = blob_buffer(pOut)+lenOld;
1110 while( zDiff<zInst+lenInst ){
1111 u64 lenCpy = (*zDiff)&0x3f;
1112 const char *zCpy;
1113
M src/import.c
+11 -7
--- src/import.c
+++ src/import.c
@@ -1091,18 +1091,22 @@
10911091
 fossil_fatal("Invalid svndiff0 format");
10921092
 }
10931093
 zDiff += 4;
10941094
 blob_zero(pOut);
10951095
 while( zDiff<(blob_buffer(pDiff)+blob_size(pDiff)) ){
1096
+ u64 lenOut, lenInst, lenData, lenOld;
1097
+ const char *zInst;
1098
+ const char *zData;
1099
+
10961100
 u64 offSrc = svn_get_varint(&zDiff);
1097
- /*u64 lenSrc =*/ svn_get_varint(&zDiff);
1098
- u64 lenOut = svn_get_varint(&zDiff);
1099
- u64 lenInst = svn_get_varint(&zDiff);
1100
- u64 lenData = svn_get_varint(&zDiff);
1101
- const char *zInst = zDiff;
1102
- const char *zData = zInst+lenInst;
1103
- u64 lenOld = blob_size(pOut);
1101
+ /*lenSrc =*/ svn_get_varint(&zDiff);
1102
+ lenOut = svn_get_varint(&zDiff);
1103
+ lenInst = svn_get_varint(&zDiff);
1104
+ lenData = svn_get_varint(&zDiff);
1105
+ zInst = zDiff;
1106
+ zData = zInst+lenInst;
1107
+ lenOld = blob_size(pOut);
11041108
 blob_resize(pOut, lenOut+lenOld);
11051109
 zOut = blob_buffer(pOut)+lenOld;
11061110
 while( zDiff<zInst+lenInst ){
11071111
 u64 lenCpy = (*zDiff)&0x3f;
11081112
 const char *zCpy;
11091113
--- src/import.c
+++ src/import.c
@@ -1091,18 +1091,22 @@
1091 fossil_fatal("Invalid svndiff0 format");
1092 }
1093 zDiff += 4;
1094 blob_zero(pOut);
1095 while( zDiff<(blob_buffer(pDiff)+blob_size(pDiff)) ){
 
 
 
 
1096 u64 offSrc = svn_get_varint(&zDiff);
1097 /*u64 lenSrc =*/ svn_get_varint(&zDiff);
1098 u64 lenOut = svn_get_varint(&zDiff);
1099 u64 lenInst = svn_get_varint(&zDiff);
1100 u64 lenData = svn_get_varint(&zDiff);
1101 const char *zInst = zDiff;
1102 const char *zData = zInst+lenInst;
1103 u64 lenOld = blob_size(pOut);
1104 blob_resize(pOut, lenOut+lenOld);
1105 zOut = blob_buffer(pOut)+lenOld;
1106 while( zDiff<zInst+lenInst ){
1107 u64 lenCpy = (*zDiff)&0x3f;
1108 const char *zCpy;
1109
--- src/import.c
+++ src/import.c
@@ -1091,18 +1091,22 @@
1091 fossil_fatal("Invalid svndiff0 format");
1092 }
1093 zDiff += 4;
1094 blob_zero(pOut);
1095 while( zDiff<(blob_buffer(pDiff)+blob_size(pDiff)) ){
1096 u64 lenOut, lenInst, lenData, lenOld;
1097 const char *zInst;
1098 const char *zData;
1099
1100 u64 offSrc = svn_get_varint(&zDiff);
1101 /*lenSrc =*/ svn_get_varint(&zDiff);
1102 lenOut = svn_get_varint(&zDiff);
1103 lenInst = svn_get_varint(&zDiff);
1104 lenData = svn_get_varint(&zDiff);
1105 zInst = zDiff;
1106 zData = zInst+lenInst;
1107 lenOld = blob_size(pOut);
1108 blob_resize(pOut, lenOut+lenOld);
1109 zOut = blob_buffer(pOut)+lenOld;
1110 while( zDiff<zInst+lenInst ){
1111 u64 lenCpy = (*zDiff)&0x3f;
1112 const char *zCpy;
1113

Keyboard Shortcuts

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