Fossil SCM
Fix indentation and tabs to style guide
Commit
081a29c0b7689c4bfe33889389a95f3f0915ed81
Parent
ac7be7fd6c37a54…
1 file changed
+24
-24
+24
-24
| --- src/tkt.c | ||
| +++ src/tkt.c | ||
| @@ -1009,11 +1009,11 @@ | ||
| 1009 | 1009 | /* read commandline and assign fields in the azValue array */ |
| 1010 | 1010 | while( i<g.argc ){ |
| 1011 | 1011 | char *zFName; |
| 1012 | 1012 | char *zFValue; |
| 1013 | 1013 | int j; |
| 1014 | - int append = 0; | |
| 1014 | + int append = 0; | |
| 1015 | 1015 | |
| 1016 | 1016 | zFName = g.argv[i++]; |
| 1017 | 1017 | if( i==g.argc ){ |
| 1018 | 1018 | fossil_fatal("missing value for '%s'!",zFName); |
| 1019 | 1019 | } |
| @@ -1020,23 +1020,23 @@ | ||
| 1020 | 1020 | zFValue = g.argv[i++]; |
| 1021 | 1021 | if( tktEncoding == tktFossilize ){ |
| 1022 | 1022 | zFValue=mprintf("%s",zFValue); |
| 1023 | 1023 | defossilize(zFValue); |
| 1024 | 1024 | } |
| 1025 | - append = (zFName[0] == '+'); | |
| 1026 | - if (append){ | |
| 1027 | - zFName++; | |
| 1028 | - } | |
| 1025 | + append = (zFName[0] == '+'); | |
| 1026 | + if (append){ | |
| 1027 | + zFName++; | |
| 1028 | + } | |
| 1029 | 1029 | j = fieldId(zFName); |
| 1030 | 1030 | if( j == -1 ){ |
| 1031 | 1031 | fossil_fatal("unknown field name '%s'!",zFName); |
| 1032 | 1032 | }else{ |
| 1033 | - if (append) { | |
| 1034 | - azAppend[j] = zFValue; | |
| 1035 | - } else { | |
| 1036 | - azValue[j] = zFValue; | |
| 1037 | - } | |
| 1033 | + if (append) { | |
| 1034 | + azAppend[j] = zFValue; | |
| 1035 | + } else { | |
| 1036 | + azValue[j] = zFValue; | |
| 1037 | + } | |
| 1038 | 1038 | } |
| 1039 | 1039 | } |
| 1040 | 1040 | |
| 1041 | 1041 | /* now add the needed artifacts to the repository */ |
| 1042 | 1042 | blob_zero(&tktchng); |
| @@ -1048,26 +1048,26 @@ | ||
| 1048 | 1048 | free(zDate); |
| 1049 | 1049 | } |
| 1050 | 1050 | /* append defined elements */ |
| 1051 | 1051 | for(i=0; i<nField; i++){ |
| 1052 | 1052 | char *zValue = 0; |
| 1053 | - char *zPfx; | |
| 1054 | - | |
| 1055 | - if (azAppend[i] && azAppend[i][0] ){ | |
| 1056 | - zPfx = " +"; | |
| 1057 | - zValue = azAppend[i]; | |
| 1058 | - } else if( azValue[i] && azValue[i][0] ){ | |
| 1059 | - zPfx = " "; | |
| 1060 | - zValue = azValue[i]; | |
| 1061 | - } else { | |
| 1062 | - continue; | |
| 1063 | - } | |
| 1053 | + char *zPfx; | |
| 1054 | + | |
| 1055 | + if (azAppend[i] && azAppend[i][0] ){ | |
| 1056 | + zPfx = " +"; | |
| 1057 | + zValue = azAppend[i]; | |
| 1058 | + } else if( azValue[i] && azValue[i][0] ){ | |
| 1059 | + zPfx = " "; | |
| 1060 | + zValue = azValue[i]; | |
| 1061 | + } else { | |
| 1062 | + continue; | |
| 1063 | + } | |
| 1064 | 1064 | if( strncmp(azField[i], "private_", 8)==0 ){ |
| 1065 | 1065 | zValue = db_conceal(zValue, strlen(zValue)); |
| 1066 | 1066 | blob_appendf(&tktchng, "J%s%s %s\n", zPfx, azField[i], zValue); |
| 1067 | 1067 | }else{ |
| 1068 | - blob_appendf(&tktchng, "J%s%s %#F\n", zPfx, | |
| 1068 | + blob_appendf(&tktchng, "J%s%s %#F\n", zPfx, | |
| 1069 | 1069 | azField[i], strlen(zValue), zValue); |
| 1070 | 1070 | } |
| 1071 | 1071 | if( tktEncoding == tktFossilize ){ |
| 1072 | 1072 | free(azValue[i]); |
| 1073 | 1073 | } |
| @@ -1082,11 +1082,11 @@ | ||
| 1082 | 1082 | } |
| 1083 | 1083 | manifest_crosslink_begin(); |
| 1084 | 1084 | manifest_crosslink(rid, &tktchng); |
| 1085 | 1085 | manifest_crosslink_end(); |
| 1086 | 1086 | assert( blob_is_reset(&tktchng) ); |
| 1087 | - printf("ticket %s succeeded for UID %s\n", | |
| 1088 | - (eCmd==set?"set":"add"),zTktUuid); | |
| 1087 | + printf("ticket %s succeeded for UID %s\n", | |
| 1088 | + (eCmd==set?"set":"add"),zTktUuid); | |
| 1089 | 1089 | } |
| 1090 | 1090 | } |
| 1091 | 1091 | } |
| 1092 | 1092 | } |
| 1093 | 1093 |
| --- src/tkt.c | |
| +++ src/tkt.c | |
| @@ -1009,11 +1009,11 @@ | |
| 1009 | /* read commandline and assign fields in the azValue array */ |
| 1010 | while( i<g.argc ){ |
| 1011 | char *zFName; |
| 1012 | char *zFValue; |
| 1013 | int j; |
| 1014 | int append = 0; |
| 1015 | |
| 1016 | zFName = g.argv[i++]; |
| 1017 | if( i==g.argc ){ |
| 1018 | fossil_fatal("missing value for '%s'!",zFName); |
| 1019 | } |
| @@ -1020,23 +1020,23 @@ | |
| 1020 | zFValue = g.argv[i++]; |
| 1021 | if( tktEncoding == tktFossilize ){ |
| 1022 | zFValue=mprintf("%s",zFValue); |
| 1023 | defossilize(zFValue); |
| 1024 | } |
| 1025 | append = (zFName[0] == '+'); |
| 1026 | if (append){ |
| 1027 | zFName++; |
| 1028 | } |
| 1029 | j = fieldId(zFName); |
| 1030 | if( j == -1 ){ |
| 1031 | fossil_fatal("unknown field name '%s'!",zFName); |
| 1032 | }else{ |
| 1033 | if (append) { |
| 1034 | azAppend[j] = zFValue; |
| 1035 | } else { |
| 1036 | azValue[j] = zFValue; |
| 1037 | } |
| 1038 | } |
| 1039 | } |
| 1040 | |
| 1041 | /* now add the needed artifacts to the repository */ |
| 1042 | blob_zero(&tktchng); |
| @@ -1048,26 +1048,26 @@ | |
| 1048 | free(zDate); |
| 1049 | } |
| 1050 | /* append defined elements */ |
| 1051 | for(i=0; i<nField; i++){ |
| 1052 | char *zValue = 0; |
| 1053 | char *zPfx; |
| 1054 | |
| 1055 | if (azAppend[i] && azAppend[i][0] ){ |
| 1056 | zPfx = " +"; |
| 1057 | zValue = azAppend[i]; |
| 1058 | } else if( azValue[i] && azValue[i][0] ){ |
| 1059 | zPfx = " "; |
| 1060 | zValue = azValue[i]; |
| 1061 | } else { |
| 1062 | continue; |
| 1063 | } |
| 1064 | if( strncmp(azField[i], "private_", 8)==0 ){ |
| 1065 | zValue = db_conceal(zValue, strlen(zValue)); |
| 1066 | blob_appendf(&tktchng, "J%s%s %s\n", zPfx, azField[i], zValue); |
| 1067 | }else{ |
| 1068 | blob_appendf(&tktchng, "J%s%s %#F\n", zPfx, |
| 1069 | azField[i], strlen(zValue), zValue); |
| 1070 | } |
| 1071 | if( tktEncoding == tktFossilize ){ |
| 1072 | free(azValue[i]); |
| 1073 | } |
| @@ -1082,11 +1082,11 @@ | |
| 1082 | } |
| 1083 | manifest_crosslink_begin(); |
| 1084 | manifest_crosslink(rid, &tktchng); |
| 1085 | manifest_crosslink_end(); |
| 1086 | assert( blob_is_reset(&tktchng) ); |
| 1087 | printf("ticket %s succeeded for UID %s\n", |
| 1088 | (eCmd==set?"set":"add"),zTktUuid); |
| 1089 | } |
| 1090 | } |
| 1091 | } |
| 1092 | } |
| 1093 |
| --- src/tkt.c | |
| +++ src/tkt.c | |
| @@ -1009,11 +1009,11 @@ | |
| 1009 | /* read commandline and assign fields in the azValue array */ |
| 1010 | while( i<g.argc ){ |
| 1011 | char *zFName; |
| 1012 | char *zFValue; |
| 1013 | int j; |
| 1014 | int append = 0; |
| 1015 | |
| 1016 | zFName = g.argv[i++]; |
| 1017 | if( i==g.argc ){ |
| 1018 | fossil_fatal("missing value for '%s'!",zFName); |
| 1019 | } |
| @@ -1020,23 +1020,23 @@ | |
| 1020 | zFValue = g.argv[i++]; |
| 1021 | if( tktEncoding == tktFossilize ){ |
| 1022 | zFValue=mprintf("%s",zFValue); |
| 1023 | defossilize(zFValue); |
| 1024 | } |
| 1025 | append = (zFName[0] == '+'); |
| 1026 | if (append){ |
| 1027 | zFName++; |
| 1028 | } |
| 1029 | j = fieldId(zFName); |
| 1030 | if( j == -1 ){ |
| 1031 | fossil_fatal("unknown field name '%s'!",zFName); |
| 1032 | }else{ |
| 1033 | if (append) { |
| 1034 | azAppend[j] = zFValue; |
| 1035 | } else { |
| 1036 | azValue[j] = zFValue; |
| 1037 | } |
| 1038 | } |
| 1039 | } |
| 1040 | |
| 1041 | /* now add the needed artifacts to the repository */ |
| 1042 | blob_zero(&tktchng); |
| @@ -1048,26 +1048,26 @@ | |
| 1048 | free(zDate); |
| 1049 | } |
| 1050 | /* append defined elements */ |
| 1051 | for(i=0; i<nField; i++){ |
| 1052 | char *zValue = 0; |
| 1053 | char *zPfx; |
| 1054 | |
| 1055 | if (azAppend[i] && azAppend[i][0] ){ |
| 1056 | zPfx = " +"; |
| 1057 | zValue = azAppend[i]; |
| 1058 | } else if( azValue[i] && azValue[i][0] ){ |
| 1059 | zPfx = " "; |
| 1060 | zValue = azValue[i]; |
| 1061 | } else { |
| 1062 | continue; |
| 1063 | } |
| 1064 | if( strncmp(azField[i], "private_", 8)==0 ){ |
| 1065 | zValue = db_conceal(zValue, strlen(zValue)); |
| 1066 | blob_appendf(&tktchng, "J%s%s %s\n", zPfx, azField[i], zValue); |
| 1067 | }else{ |
| 1068 | blob_appendf(&tktchng, "J%s%s %#F\n", zPfx, |
| 1069 | azField[i], strlen(zValue), zValue); |
| 1070 | } |
| 1071 | if( tktEncoding == tktFossilize ){ |
| 1072 | free(azValue[i]); |
| 1073 | } |
| @@ -1082,11 +1082,11 @@ | |
| 1082 | } |
| 1083 | manifest_crosslink_begin(); |
| 1084 | manifest_crosslink(rid, &tktchng); |
| 1085 | manifest_crosslink_end(); |
| 1086 | assert( blob_is_reset(&tktchng) ); |
| 1087 | printf("ticket %s succeeded for UID %s\n", |
| 1088 | (eCmd==set?"set":"add"),zTktUuid); |
| 1089 | } |
| 1090 | } |
| 1091 | } |
| 1092 | } |
| 1093 |