Fossil SCM
Fix compiler warnings with MSVC.
Commit
8ab3f62090095da33aef86fa20bd37e293106205
Parent
0c6f8fe57dcc913…
1 file changed
+6
-4
+6
-4
| --- src/url.c | ||
| +++ src/url.c | ||
| @@ -454,12 +454,12 @@ | ||
| 454 | 454 | ** Resets the given URL object, deallocating any memory |
| 455 | 455 | ** it uses. |
| 456 | 456 | */ |
| 457 | 457 | void url_reset(HQuery *p){ |
| 458 | 458 | blob_reset(&p->url); |
| 459 | - fossil_free(p->azName); | |
| 460 | - fossil_free(p->azValue); | |
| 459 | + fossil_free((void *)p->azName); | |
| 460 | + fossil_free((void *)p->azValue); | |
| 461 | 461 | url_initialize(p, p->zBase); |
| 462 | 462 | } |
| 463 | 463 | |
| 464 | 464 | /* |
| 465 | 465 | ** Add a fixed parameter to an HQuery. Or remove the parameters if zValue==0. |
| @@ -480,12 +480,14 @@ | ||
| 480 | 480 | } |
| 481 | 481 | assert( i==p->nParam ); |
| 482 | 482 | if( zValue==0 ) return; |
| 483 | 483 | if( i>=p->nAlloc ){ |
| 484 | 484 | p->nAlloc = p->nAlloc*2 + 10; |
| 485 | - p->azName = fossil_realloc(p->azName, sizeof(p->azName[0])*p->nAlloc); | |
| 486 | - p->azValue = fossil_realloc(p->azValue, sizeof(p->azValue[0])*p->nAlloc); | |
| 485 | + p->azName = fossil_realloc((void *)p->azName, | |
| 486 | + sizeof(p->azName[0])*p->nAlloc); | |
| 487 | + p->azValue = fossil_realloc((void *)p->azValue, | |
| 488 | + sizeof(p->azValue[0])*p->nAlloc); | |
| 487 | 489 | } |
| 488 | 490 | p->azName[i] = zName; |
| 489 | 491 | p->azValue[i] = zValue; |
| 490 | 492 | p->nParam++; |
| 491 | 493 | } |
| 492 | 494 |
| --- src/url.c | |
| +++ src/url.c | |
| @@ -454,12 +454,12 @@ | |
| 454 | ** Resets the given URL object, deallocating any memory |
| 455 | ** it uses. |
| 456 | */ |
| 457 | void url_reset(HQuery *p){ |
| 458 | blob_reset(&p->url); |
| 459 | fossil_free(p->azName); |
| 460 | fossil_free(p->azValue); |
| 461 | url_initialize(p, p->zBase); |
| 462 | } |
| 463 | |
| 464 | /* |
| 465 | ** Add a fixed parameter to an HQuery. Or remove the parameters if zValue==0. |
| @@ -480,12 +480,14 @@ | |
| 480 | } |
| 481 | assert( i==p->nParam ); |
| 482 | if( zValue==0 ) return; |
| 483 | if( i>=p->nAlloc ){ |
| 484 | p->nAlloc = p->nAlloc*2 + 10; |
| 485 | p->azName = fossil_realloc(p->azName, sizeof(p->azName[0])*p->nAlloc); |
| 486 | p->azValue = fossil_realloc(p->azValue, sizeof(p->azValue[0])*p->nAlloc); |
| 487 | } |
| 488 | p->azName[i] = zName; |
| 489 | p->azValue[i] = zValue; |
| 490 | p->nParam++; |
| 491 | } |
| 492 |
| --- src/url.c | |
| +++ src/url.c | |
| @@ -454,12 +454,12 @@ | |
| 454 | ** Resets the given URL object, deallocating any memory |
| 455 | ** it uses. |
| 456 | */ |
| 457 | void url_reset(HQuery *p){ |
| 458 | blob_reset(&p->url); |
| 459 | fossil_free((void *)p->azName); |
| 460 | fossil_free((void *)p->azValue); |
| 461 | url_initialize(p, p->zBase); |
| 462 | } |
| 463 | |
| 464 | /* |
| 465 | ** Add a fixed parameter to an HQuery. Or remove the parameters if zValue==0. |
| @@ -480,12 +480,14 @@ | |
| 480 | } |
| 481 | assert( i==p->nParam ); |
| 482 | if( zValue==0 ) return; |
| 483 | if( i>=p->nAlloc ){ |
| 484 | p->nAlloc = p->nAlloc*2 + 10; |
| 485 | p->azName = fossil_realloc((void *)p->azName, |
| 486 | sizeof(p->azName[0])*p->nAlloc); |
| 487 | p->azValue = fossil_realloc((void *)p->azValue, |
| 488 | sizeof(p->azValue[0])*p->nAlloc); |
| 489 | } |
| 490 | p->azName[i] = zName; |
| 491 | p->azValue[i] = zValue; |
| 492 | p->nParam++; |
| 493 | } |
| 494 |