bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Convert strtrim/strlen paired calls to only strtrim

Browse source 
This utilizes the new return value so we don't have to find the length
of the string again.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2011-12-23 14:47:30 -06:00
parent 38143770a9
commit c34b69b5c7
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/pacman/conf.c
View file

@ -726,8 +726,7 @@ static int _parseconfig(const char *file, struct section_t *section,
*ptr = '\0'; *ptr = '\0';
} }
strtrim(line); line_len = strtrim(line);
line_len = strlen(line);
if(line_len == 0) { if(line_len == 0) {
continue; continue;

18
src/pacman/util.c
View file

@ -1228,14 +1228,14 @@ static int multiselect_parse(char *array, int count, char *response)
for(str = response; ; str = NULL) { for(str = response; ; str = NULL) {
int include = 1; int include = 1;
int start, end; int start, end;
size_t len;
char *ends = NULL; char *ends = NULL;
char *starts = strtok_r(str, " ", &saveptr); char *starts = strtok_r(str, " ", &saveptr);
if(starts == NULL) { if(starts == NULL) {
break; break;
} }
strtrim(starts); len = strtrim(starts);
int len = strlen(starts);
if(len == 0) if(len == 0)
continue; continue;
@ -1314,6 +1314,7 @@ int multiselect_question(char *array, int count)
if(fgets(response, response_len, stdin)) { if(fgets(response, response_len, stdin)) {
const size_t response_incr = 64; const size_t response_incr = 64;
size_t len;
/* handle buffer not being large enough to read full line case */ /* handle buffer not being large enough to read full line case */
while(*lastchar == '\0' && lastchar[-1] != '\n') { while(*lastchar == '\0' && lastchar[-1] != '\n') {
response_len += response_incr; response_len += response_incr;
@ -1330,8 +1331,9 @@ int multiselect_question(char *array, int count)
return -1; return -1;
} }
} }
strtrim(response);
if(strlen(response) > 0) { len = strtrim(response);
if(len > 0) {
if(multiselect_parse(array, count, response) == -1) { if(multiselect_parse(array, count, response) == -1) {
/* only loop if user gave an invalid answer */ /* only loop if user gave an invalid answer */
continue; continue;
@ -1374,8 +1376,8 @@ int select_question(int count)
flush_term_input(); flush_term_input();
if(fgets(response, sizeof(response), stdin)) { if(fgets(response, sizeof(response), stdin)) {
strtrim(response); size_t len = strtrim(response);
if(strlen(response) > 0) { if(len > 0) {
int n; int n;
if(parseindex(response, &n, 1, count) != 0) if(parseindex(response, &n, 1, count) != 0)
continue; continue;
@ -1423,8 +1425,8 @@ static int question(short preset, char *fmt, va_list args)
flush_term_input(); flush_term_input();
if(fgets(response, sizeof(response), stdin)) { if(fgets(response, sizeof(response), stdin)) {
strtrim(response); size_t len = strtrim(response);
if(strlen(response) == 0) { if(len == 0) {
return preset; return preset;
} }