Fossil SCM
src/merge.c: In function ‘merge_cmd’: src/merge.c:103:7: warning: ‘mid’ may be used uninitialized in this function
Commit
39fa6911fc1052385521308819103196d9a84b67
Parent
d59455e3f218de2…
1 file changed
+1
+1
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -205,10 +205,11 @@ | ||
| 205 | 205 | fossil_free(zCom); |
| 206 | 206 | } |
| 207 | 207 | db_finalize(&q); |
| 208 | 208 | }else{ |
| 209 | 209 | usage("?OPTIONS? ?VERSION?"); |
| 210 | + return; | |
| 210 | 211 | } |
| 211 | 212 | |
| 212 | 213 | if( zPivot ){ |
| 213 | 214 | pid = name_to_typed_rid(zPivot, "ci"); |
| 214 | 215 | if( pid==0 || !is_a_version(pid) ){ |
| 215 | 216 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -205,10 +205,11 @@ | |
| 205 | fossil_free(zCom); |
| 206 | } |
| 207 | db_finalize(&q); |
| 208 | }else{ |
| 209 | usage("?OPTIONS? ?VERSION?"); |
| 210 | } |
| 211 | |
| 212 | if( zPivot ){ |
| 213 | pid = name_to_typed_rid(zPivot, "ci"); |
| 214 | if( pid==0 || !is_a_version(pid) ){ |
| 215 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -205,10 +205,11 @@ | |
| 205 | fossil_free(zCom); |
| 206 | } |
| 207 | db_finalize(&q); |
| 208 | }else{ |
| 209 | usage("?OPTIONS? ?VERSION?"); |
| 210 | return; |
| 211 | } |
| 212 | |
| 213 | if( zPivot ){ |
| 214 | pid = name_to_typed_rid(zPivot, "ci"); |
| 215 | if( pid==0 || !is_a_version(pid) ){ |
| 216 |