Fossil SCM
Revert [48499514cc], changing nUsed to zero is not redundant as blob_append() changes it to one.
Commit
4742716fc16c713eb296c29902c0267ee432844f
Parent
16ab6ee852cdebb…
1 file changed
+2
-1
+2
-1
| --- src/blob.c | ||
| +++ src/blob.c | ||
| @@ -300,11 +300,12 @@ | ||
| 300 | 300 | ** Return a pointer to a null-terminated string for a blob. |
| 301 | 301 | */ |
| 302 | 302 | char *blob_str(Blob *p){ |
| 303 | 303 | blob_is_init(p); |
| 304 | 304 | if( p->nUsed==0 ){ |
| 305 | - blob_append(p, "", 1); | |
| 305 | + blob_append(p, "", 1); /* NOTE: Changes nUsed. */ | |
| 306 | + p->nUsed = 0; | |
| 306 | 307 | } |
| 307 | 308 | if( p->aData[p->nUsed]!=0 ){ |
| 308 | 309 | blob_materialize(p); |
| 309 | 310 | } |
| 310 | 311 | return p->aData; |
| 311 | 312 |
| --- src/blob.c | |
| +++ src/blob.c | |
| @@ -300,11 +300,12 @@ | |
| 300 | ** Return a pointer to a null-terminated string for a blob. |
| 301 | */ |
| 302 | char *blob_str(Blob *p){ |
| 303 | blob_is_init(p); |
| 304 | if( p->nUsed==0 ){ |
| 305 | blob_append(p, "", 1); |
| 306 | } |
| 307 | if( p->aData[p->nUsed]!=0 ){ |
| 308 | blob_materialize(p); |
| 309 | } |
| 310 | return p->aData; |
| 311 |
| --- src/blob.c | |
| +++ src/blob.c | |
| @@ -300,11 +300,12 @@ | |
| 300 | ** Return a pointer to a null-terminated string for a blob. |
| 301 | */ |
| 302 | char *blob_str(Blob *p){ |
| 303 | blob_is_init(p); |
| 304 | if( p->nUsed==0 ){ |
| 305 | blob_append(p, "", 1); /* NOTE: Changes nUsed. */ |
| 306 | p->nUsed = 0; |
| 307 | } |
| 308 | if( p->aData[p->nUsed]!=0 ){ |
| 309 | blob_materialize(p); |
| 310 | } |
| 311 | return p->aData; |
| 312 |