Mercurial > trustbridge
comparison cinst/main.c @ 116:c602d8cfa619
Refactoring: unified naming of string vector functions.
| author | Sascha Wilde <wilde@intevation.de> |
|---|---|
| date | Fri, 21 Mar 2014 17:42:00 +0100 |
| parents | 80ab2168760f |
| children | 24fb90ef8f6a |
comparison
equal
deleted
inserted
replaced
| 114:447a7abee6c7 | 116:c602d8cfa619 |
|---|---|
| 90 str_append_str(certificate_list, &list_size, buf, len); | 90 str_append_str(certificate_list, &list_size, buf, len); |
| 91 continue; | 91 continue; |
| 92 } | 92 } |
| 93 if (*buf == 'I') { | 93 if (*buf == 'I') { |
| 94 /* Remove leading I: and trailing \r\n */ | 94 /* Remove leading I: and trailing \r\n */ |
| 95 array_append_str(to_install, buf+2, len - 4); | 95 strv_append(to_install, buf+2, len - 4); |
| 96 continue; | 96 continue; |
| 97 } | 97 } |
| 98 if (*buf == 'R') { | 98 if (*buf == 'R') { |
| 99 /* Remove leading R: and trailing \r\n */ | 99 /* Remove leading R: and trailing \r\n */ |
| 100 array_append_str(to_remove, buf+2, len - 4); | 100 strv_append(to_remove, buf+2, len - 4); |
| 101 continue; | 101 continue; |
| 102 } | 102 } |
| 103 if (strcmp("UNINSTALL", buf) == 0) { | 103 if (strcmp("UNINSTALL", buf) == 0) { |
| 104 /* Remove trailing \r\n */ | 104 /* Remove trailing \r\n */ |
| 105 array_append_str(to_remove, buf, len - 2); | 105 strv_append(to_remove, buf, len - 2); |
| 106 } | 106 } |
| 107 } | 107 } |
| 108 | 108 |
| 109 return 0; | 109 return 0; |
| 110 } | 110 } |
| 253 install_certificates_win((const char**) to_install, 1); | 253 install_certificates_win((const char**) to_install, 1); |
| 254 //remove_certificates_win((const char**) to_remove, 1); | 254 //remove_certificates_win((const char**) to_remove, 1); |
| 255 #endif | 255 #endif |
| 256 | 256 |
| 257 /* Make valgrind happy */ | 257 /* Make valgrind happy */ |
| 258 strfreev(to_install); | 258 strv_free(to_install); |
| 259 strfreev(to_remove); | 259 strv_free(to_remove); |
| 260 free(certificate_list); | 260 free(certificate_list); |
| 261 | 261 |
| 262 return 0; | 262 return 0; |
| 263 } | 263 } |