Fossil SCM
Fix a C++-ism in the import code.
Commit
87c4b7c48c12a84f9d5836657b5dfe370846eef8a3805b860517543c973991c0
Parent
939a13d94fc737f…
1 file changed
+2
-1
+2
-1
| --- src/import.c | ||
| +++ src/import.c | ||
| @@ -1947,15 +1947,16 @@ | ||
| 1947 | 1947 | ** The following 'fx_' table is used to hold information needed for |
| 1948 | 1948 | ** importing and exporting to attribute Fossil check-ins or Git commits |
| 1949 | 1949 | ** to either a desired username or full contact information string. |
| 1950 | 1950 | */ |
| 1951 | 1951 | if(ggit.nGitAttr > 0) { |
| 1952 | + int idx; | |
| 1952 | 1953 | db_unprotect(PROTECT_ALL); |
| 1953 | 1954 | db_multi_exec( |
| 1954 | 1955 | "CREATE TABLE fx_git(user TEXT, email TEXT UNIQUE);" |
| 1955 | 1956 | ); |
| 1956 | - for( int idx = 0; idx < ggit.nGitAttr; ++idx ){ | |
| 1957 | + for(idx = 0; idx < ggit.nGitAttr; ++idx ){ | |
| 1957 | 1958 | db_multi_exec( |
| 1958 | 1959 | "INSERT OR IGNORE INTO fx_git(user, email) VALUES(%Q, %Q)", |
| 1959 | 1960 | ggit.gitUserInfo[idx].zUser, ggit.gitUserInfo[idx].zEmail |
| 1960 | 1961 | ); |
| 1961 | 1962 | } |
| 1962 | 1963 |
| --- src/import.c | |
| +++ src/import.c | |
| @@ -1947,15 +1947,16 @@ | |
| 1947 | ** The following 'fx_' table is used to hold information needed for |
| 1948 | ** importing and exporting to attribute Fossil check-ins or Git commits |
| 1949 | ** to either a desired username or full contact information string. |
| 1950 | */ |
| 1951 | if(ggit.nGitAttr > 0) { |
| 1952 | db_unprotect(PROTECT_ALL); |
| 1953 | db_multi_exec( |
| 1954 | "CREATE TABLE fx_git(user TEXT, email TEXT UNIQUE);" |
| 1955 | ); |
| 1956 | for( int idx = 0; idx < ggit.nGitAttr; ++idx ){ |
| 1957 | db_multi_exec( |
| 1958 | "INSERT OR IGNORE INTO fx_git(user, email) VALUES(%Q, %Q)", |
| 1959 | ggit.gitUserInfo[idx].zUser, ggit.gitUserInfo[idx].zEmail |
| 1960 | ); |
| 1961 | } |
| 1962 |
| --- src/import.c | |
| +++ src/import.c | |
| @@ -1947,15 +1947,16 @@ | |
| 1947 | ** The following 'fx_' table is used to hold information needed for |
| 1948 | ** importing and exporting to attribute Fossil check-ins or Git commits |
| 1949 | ** to either a desired username or full contact information string. |
| 1950 | */ |
| 1951 | if(ggit.nGitAttr > 0) { |
| 1952 | int idx; |
| 1953 | db_unprotect(PROTECT_ALL); |
| 1954 | db_multi_exec( |
| 1955 | "CREATE TABLE fx_git(user TEXT, email TEXT UNIQUE);" |
| 1956 | ); |
| 1957 | for(idx = 0; idx < ggit.nGitAttr; ++idx ){ |
| 1958 | db_multi_exec( |
| 1959 | "INSERT OR IGNORE INTO fx_git(user, email) VALUES(%Q, %Q)", |
| 1960 | ggit.gitUserInfo[idx].zUser, ggit.gitUserInfo[idx].zEmail |
| 1961 | ); |
| 1962 | } |
| 1963 |