Fossil SCM
Some more style en comment fixes, backported from [d57f0a9361], that I missed before.
Commit
1e2fdf98bc536d78b7ab2df68d7eda2debde5616
Parent
eb949991434d3e1…
1 file changed
+4
-4
+4
-4
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -900,20 +900,20 @@ | ||
| 900 | 900 | Blob ans; |
| 901 | 901 | char cReply; |
| 902 | 902 | |
| 903 | 903 | if( eType&1 ){ |
| 904 | 904 | if( crnlOk ){ |
| 905 | - return; /* We don't want CrLf warnings for this file. */ | |
| 905 | + return; /* We don't want CR/NL warnings for this file. */ | |
| 906 | 906 | } |
| 907 | - zWarning = "CR/NL line endings"; | |
| 907 | + zWarning = "CR/NL line endings"; | |
| 908 | 908 | }else{ |
| 909 | - zWarning = "Unicode"; | |
| 909 | + zWarning = "Unicode"; | |
| 910 | 910 | } |
| 911 | 911 | file_relative_name(zFilename, &fname, 0); |
| 912 | 912 | blob_zero(&ans); |
| 913 | 913 | zMsg = mprintf( |
| 914 | - "%s contains %s. commit anyhow (a=all/y/N)? ", | |
| 914 | + "%s contains %s. commit anyhow (a=all/y/N)? ", | |
| 915 | 915 | blob_str(&fname), zWarning ); |
| 916 | 916 | prompt_user(zMsg, &ans); |
| 917 | 917 | fossil_free(zMsg); |
| 918 | 918 | cReply = blob_str(&ans)[0]; |
| 919 | 919 | if( cReply=='a' || cReply=='A' ){ |
| 920 | 920 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -900,20 +900,20 @@ | |
| 900 | Blob ans; |
| 901 | char cReply; |
| 902 | |
| 903 | if( eType&1 ){ |
| 904 | if( crnlOk ){ |
| 905 | return; /* We don't want CrLf warnings for this file. */ |
| 906 | } |
| 907 | zWarning = "CR/NL line endings"; |
| 908 | }else{ |
| 909 | zWarning = "Unicode"; |
| 910 | } |
| 911 | file_relative_name(zFilename, &fname, 0); |
| 912 | blob_zero(&ans); |
| 913 | zMsg = mprintf( |
| 914 | "%s contains %s. commit anyhow (a=all/y/N)? ", |
| 915 | blob_str(&fname), zWarning ); |
| 916 | prompt_user(zMsg, &ans); |
| 917 | fossil_free(zMsg); |
| 918 | cReply = blob_str(&ans)[0]; |
| 919 | if( cReply=='a' || cReply=='A' ){ |
| 920 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -900,20 +900,20 @@ | |
| 900 | Blob ans; |
| 901 | char cReply; |
| 902 | |
| 903 | if( eType&1 ){ |
| 904 | if( crnlOk ){ |
| 905 | return; /* We don't want CR/NL warnings for this file. */ |
| 906 | } |
| 907 | zWarning = "CR/NL line endings"; |
| 908 | }else{ |
| 909 | zWarning = "Unicode"; |
| 910 | } |
| 911 | file_relative_name(zFilename, &fname, 0); |
| 912 | blob_zero(&ans); |
| 913 | zMsg = mprintf( |
| 914 | "%s contains %s. commit anyhow (a=all/y/N)? ", |
| 915 | blob_str(&fname), zWarning ); |
| 916 | prompt_user(zMsg, &ans); |
| 917 | fossil_free(zMsg); |
| 918 | cReply = blob_str(&ans)[0]; |
| 919 | if( cReply=='a' || cReply=='A' ){ |
| 920 |