Fossil SCM
Fix compilation on MSVC
Commit
916d1d463e8e55e1708c7d0502d20109362a638d
Parent
c3bcab0f0505eb9…
1 file changed
+11
-7
+11
-7
| --- src/import.c | ||
| +++ src/import.c | ||
| @@ -1084,18 +1084,22 @@ | ||
| 1084 | 1084 | fossil_fatal("Invalid svndiff0 format"); |
| 1085 | 1085 | } |
| 1086 | 1086 | zDiff += 4; |
| 1087 | 1087 | blob_zero(pOut); |
| 1088 | 1088 | while( zDiff<(blob_buffer(pDiff)+blob_size(pDiff)) ){ |
| 1089 | + u64 lenOut, lenInst, lenData, lenOld; | |
| 1090 | + const char *zInst; | |
| 1091 | + const char *zData; | |
| 1092 | + | |
| 1089 | 1093 | u64 offSrc = svn_get_varint(&zDiff); |
| 1090 | - /*u64 lenSrc =*/ svn_get_varint(&zDiff); | |
| 1091 | - u64 lenOut = svn_get_varint(&zDiff); | |
| 1092 | - u64 lenInst = svn_get_varint(&zDiff); | |
| 1093 | - u64 lenData = svn_get_varint(&zDiff); | |
| 1094 | - const char *zInst = zDiff; | |
| 1095 | - const char *zData = zInst+lenInst; | |
| 1096 | - u64 lenOld = blob_size(pOut); | |
| 1094 | + /*lenSrc =*/ svn_get_varint(&zDiff); | |
| 1095 | + lenOut = svn_get_varint(&zDiff); | |
| 1096 | + lenInst = svn_get_varint(&zDiff); | |
| 1097 | + lenData = svn_get_varint(&zDiff); | |
| 1098 | + zInst = zDiff; | |
| 1099 | + zData = zInst+lenInst; | |
| 1100 | + lenOld = blob_size(pOut); | |
| 1097 | 1101 | blob_resize(pOut, lenOut+lenOld); |
| 1098 | 1102 | zOut = blob_buffer(pOut)+lenOld; |
| 1099 | 1103 | while( zDiff<zInst+lenInst ){ |
| 1100 | 1104 | u64 lenCpy = (*zDiff)&0x3f; |
| 1101 | 1105 | const char *zCpy; |
| 1102 | 1106 |
| --- src/import.c | |
| +++ src/import.c | |
| @@ -1084,18 +1084,22 @@ | |
| 1084 | fossil_fatal("Invalid svndiff0 format"); |
| 1085 | } |
| 1086 | zDiff += 4; |
| 1087 | blob_zero(pOut); |
| 1088 | while( zDiff<(blob_buffer(pDiff)+blob_size(pDiff)) ){ |
| 1089 | u64 offSrc = svn_get_varint(&zDiff); |
| 1090 | /*u64 lenSrc =*/ svn_get_varint(&zDiff); |
| 1091 | u64 lenOut = svn_get_varint(&zDiff); |
| 1092 | u64 lenInst = svn_get_varint(&zDiff); |
| 1093 | u64 lenData = svn_get_varint(&zDiff); |
| 1094 | const char *zInst = zDiff; |
| 1095 | const char *zData = zInst+lenInst; |
| 1096 | u64 lenOld = blob_size(pOut); |
| 1097 | blob_resize(pOut, lenOut+lenOld); |
| 1098 | zOut = blob_buffer(pOut)+lenOld; |
| 1099 | while( zDiff<zInst+lenInst ){ |
| 1100 | u64 lenCpy = (*zDiff)&0x3f; |
| 1101 | const char *zCpy; |
| 1102 |
| --- src/import.c | |
| +++ src/import.c | |
| @@ -1084,18 +1084,22 @@ | |
| 1084 | fossil_fatal("Invalid svndiff0 format"); |
| 1085 | } |
| 1086 | zDiff += 4; |
| 1087 | blob_zero(pOut); |
| 1088 | while( zDiff<(blob_buffer(pDiff)+blob_size(pDiff)) ){ |
| 1089 | u64 lenOut, lenInst, lenData, lenOld; |
| 1090 | const char *zInst; |
| 1091 | const char *zData; |
| 1092 | |
| 1093 | u64 offSrc = svn_get_varint(&zDiff); |
| 1094 | /*lenSrc =*/ svn_get_varint(&zDiff); |
| 1095 | lenOut = svn_get_varint(&zDiff); |
| 1096 | lenInst = svn_get_varint(&zDiff); |
| 1097 | lenData = svn_get_varint(&zDiff); |
| 1098 | zInst = zDiff; |
| 1099 | zData = zInst+lenInst; |
| 1100 | lenOld = blob_size(pOut); |
| 1101 | blob_resize(pOut, lenOut+lenOld); |
| 1102 | zOut = blob_buffer(pOut)+lenOld; |
| 1103 | while( zDiff<zInst+lenInst ){ |
| 1104 | u64 lenCpy = (*zDiff)&0x3f; |
| 1105 | const char *zCpy; |
| 1106 |