Fossil SCM
Fix an uninitialized variable in update.
Commit
e3313965d3f7be52f2ce349657d30eb86d0b0f05
Parent
1b0e6c0fbbd5cd9…
1 file changed
+1
-1
+1
-1
| --- src/update.c | ||
| +++ src/update.c | ||
| @@ -65,11 +65,11 @@ | ||
| 65 | 65 | int verboseFlag; /* -v or --verbose. Output extra information */ |
| 66 | 66 | int debugFlag; /* --debug option */ |
| 67 | 67 | int nChng; /* Number of file renames */ |
| 68 | 68 | int *aChng; /* Array of file renames */ |
| 69 | 69 | int i; /* Loop counter */ |
| 70 | - int nConflict; /* Number of merge conflicts */ | |
| 70 | + int nConflict = 0; /* Number of merge conflicts */ | |
| 71 | 71 | |
| 72 | 72 | url_proxy_options(); |
| 73 | 73 | latestFlag = find_option("latest",0, 0)!=0; |
| 74 | 74 | nochangeFlag = find_option("nochange","n",0)!=0; |
| 75 | 75 | verboseFlag = find_option("verbose","v",0)!=0; |
| 76 | 76 |
| --- src/update.c | |
| +++ src/update.c | |
| @@ -65,11 +65,11 @@ | |
| 65 | int verboseFlag; /* -v or --verbose. Output extra information */ |
| 66 | int debugFlag; /* --debug option */ |
| 67 | int nChng; /* Number of file renames */ |
| 68 | int *aChng; /* Array of file renames */ |
| 69 | int i; /* Loop counter */ |
| 70 | int nConflict; /* Number of merge conflicts */ |
| 71 | |
| 72 | url_proxy_options(); |
| 73 | latestFlag = find_option("latest",0, 0)!=0; |
| 74 | nochangeFlag = find_option("nochange","n",0)!=0; |
| 75 | verboseFlag = find_option("verbose","v",0)!=0; |
| 76 |
| --- src/update.c | |
| +++ src/update.c | |
| @@ -65,11 +65,11 @@ | |
| 65 | int verboseFlag; /* -v or --verbose. Output extra information */ |
| 66 | int debugFlag; /* --debug option */ |
| 67 | int nChng; /* Number of file renames */ |
| 68 | int *aChng; /* Array of file renames */ |
| 69 | int i; /* Loop counter */ |
| 70 | int nConflict = 0; /* Number of merge conflicts */ |
| 71 | |
| 72 | url_proxy_options(); |
| 73 | latestFlag = find_option("latest",0, 0)!=0; |
| 74 | nochangeFlag = find_option("nochange","n",0)!=0; |
| 75 | verboseFlag = find_option("verbose","v",0)!=0; |
| 76 |