mirror of
https://github.com/moparisthebest/pacman
synced 2024-08-13 17:03:46 -04:00
Fix space between control structure and open parens
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
parent
b5709b8171
commit
86eefc1a3a
@ -336,7 +336,7 @@ int _alpm_pkg_validate_internal(alpm_handle_t *handle,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (validation && !*validation) {
|
if(validation && !*validation) {
|
||||||
*validation = ALPM_PKG_VALIDATION_NONE;
|
*validation = ALPM_PKG_VALIDATION_NONE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -130,7 +130,7 @@ int _alpm_filelist_resolve_link(alpm_filelist_t *files, size_t *i,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* deal with children of non-existent directories to reduce lstat() calls */
|
/* deal with children of non-existent directories to reduce lstat() calls */
|
||||||
if (!exists) {
|
if(!exists) {
|
||||||
for((*i)++; *i < files->count; (*i)++) {
|
for((*i)++; *i < files->count; (*i)++) {
|
||||||
char *f = files->files[*i].name;
|
char *f = files->files[*i].name;
|
||||||
size_t f_len = strlen(f);
|
size_t f_len = strlen(f);
|
||||||
|
@ -293,7 +293,7 @@ static int key_search(alpm_handle_t *handle, const char *fpr,
|
|||||||
pgpkey->length = key->subkeys->length;
|
pgpkey->length = key->subkeys->length;
|
||||||
pgpkey->revoked = key->subkeys->revoked;
|
pgpkey->revoked = key->subkeys->revoked;
|
||||||
|
|
||||||
switch (key->subkeys->pubkey_algo) {
|
switch(key->subkeys->pubkey_algo) {
|
||||||
case GPGME_PK_RSA:
|
case GPGME_PK_RSA:
|
||||||
case GPGME_PK_RSA_E:
|
case GPGME_PK_RSA_E:
|
||||||
case GPGME_PK_RSA_S:
|
case GPGME_PK_RSA_S:
|
||||||
|
@ -858,7 +858,7 @@ static char *hex_representation(unsigned char *bytes, size_t size)
|
|||||||
|
|
||||||
MALLOC(str, 2 * size + 1, return NULL);
|
MALLOC(str, 2 * size + 1, return NULL);
|
||||||
|
|
||||||
for (i = 0; i < size; i++) {
|
for(i = 0; i < size; i++) {
|
||||||
str[2 * i] = hex_digits[bytes[i] >> 4];
|
str[2 * i] = hex_digits[bytes[i] >> 4];
|
||||||
str[2 * i + 1] = hex_digits[bytes[i] & 0x0f];
|
str[2 * i + 1] = hex_digits[bytes[i] & 0x0f];
|
||||||
}
|
}
|
||||||
|
@ -46,7 +46,7 @@ static void parseEVR(char *evr, const char **ep, const char **vp,
|
|||||||
|
|
||||||
s = evr;
|
s = evr;
|
||||||
/* s points to epoch terminator */
|
/* s points to epoch terminator */
|
||||||
while (*s && isdigit(*s)) s++;
|
while(*s && isdigit(*s)) s++;
|
||||||
/* se points to version terminator */
|
/* se points to version terminator */
|
||||||
se = strrchr(s, '-');
|
se = strrchr(s, '-');
|
||||||
|
|
||||||
@ -100,15 +100,15 @@ static int rpmvercmp(const char *a, const char *b)
|
|||||||
two = ptr2 = str2;
|
two = ptr2 = str2;
|
||||||
|
|
||||||
/* loop through each version segment of str1 and str2 and compare them */
|
/* loop through each version segment of str1 and str2 and compare them */
|
||||||
while (*one && *two) {
|
while(*one && *two) {
|
||||||
while (*one && !isalnum((int)*one)) one++;
|
while(*one && !isalnum((int)*one)) one++;
|
||||||
while (*two && !isalnum((int)*two)) two++;
|
while(*two && !isalnum((int)*two)) two++;
|
||||||
|
|
||||||
/* If we ran to the end of either, we are finished with the loop */
|
/* If we ran to the end of either, we are finished with the loop */
|
||||||
if (!(*one && *two)) break;
|
if(!(*one && *two)) break;
|
||||||
|
|
||||||
/* If the separator lengths were different, we are also finished */
|
/* If the separator lengths were different, we are also finished */
|
||||||
if ((one - ptr1) != (two - ptr2)) {
|
if((one - ptr1) != (two - ptr2)) {
|
||||||
return (one - ptr1) < (two - ptr2) ? -1 : 1;
|
return (one - ptr1) < (two - ptr2) ? -1 : 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -118,13 +118,13 @@ static int rpmvercmp(const char *a, const char *b)
|
|||||||
/* grab first completely alpha or completely numeric segment */
|
/* grab first completely alpha or completely numeric segment */
|
||||||
/* leave one and two pointing to the start of the alpha or numeric */
|
/* leave one and two pointing to the start of the alpha or numeric */
|
||||||
/* segment and walk ptr1 and ptr2 to end of segment */
|
/* segment and walk ptr1 and ptr2 to end of segment */
|
||||||
if (isdigit((int)*ptr1)) {
|
if(isdigit((int)*ptr1)) {
|
||||||
while (*ptr1 && isdigit((int)*ptr1)) ptr1++;
|
while(*ptr1 && isdigit((int)*ptr1)) ptr1++;
|
||||||
while (*ptr2 && isdigit((int)*ptr2)) ptr2++;
|
while(*ptr2 && isdigit((int)*ptr2)) ptr2++;
|
||||||
isnum = 1;
|
isnum = 1;
|
||||||
} else {
|
} else {
|
||||||
while (*ptr1 && isalpha((int)*ptr1)) ptr1++;
|
while(*ptr1 && isalpha((int)*ptr1)) ptr1++;
|
||||||
while (*ptr2 && isalpha((int)*ptr2)) ptr2++;
|
while(*ptr2 && isalpha((int)*ptr2)) ptr2++;
|
||||||
isnum = 0;
|
isnum = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -137,7 +137,7 @@ static int rpmvercmp(const char *a, const char *b)
|
|||||||
|
|
||||||
/* this cannot happen, as we previously tested to make sure that */
|
/* this cannot happen, as we previously tested to make sure that */
|
||||||
/* the first string has a non-null segment */
|
/* the first string has a non-null segment */
|
||||||
if (one == ptr1) {
|
if(one == ptr1) {
|
||||||
ret = -1; /* arbitrary */
|
ret = -1; /* arbitrary */
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
@ -146,26 +146,26 @@ static int rpmvercmp(const char *a, const char *b)
|
|||||||
/* different types: one numeric, the other alpha (i.e. empty) */
|
/* different types: one numeric, the other alpha (i.e. empty) */
|
||||||
/* numeric segments are always newer than alpha segments */
|
/* numeric segments are always newer than alpha segments */
|
||||||
/* XXX See patch #60884 (and details) from bugzilla #50977. */
|
/* XXX See patch #60884 (and details) from bugzilla #50977. */
|
||||||
if (two == ptr2) {
|
if(two == ptr2) {
|
||||||
ret = isnum ? 1 : -1;
|
ret = isnum ? 1 : -1;
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isnum) {
|
if(isnum) {
|
||||||
/* this used to be done by converting the digit segments */
|
/* this used to be done by converting the digit segments */
|
||||||
/* to ints using atoi() - it's changed because long */
|
/* to ints using atoi() - it's changed because long */
|
||||||
/* digit segments can overflow an int - this should fix that. */
|
/* digit segments can overflow an int - this should fix that. */
|
||||||
|
|
||||||
/* throw away any leading zeros - it's a number, right? */
|
/* throw away any leading zeros - it's a number, right? */
|
||||||
while (*one == '0') one++;
|
while(*one == '0') one++;
|
||||||
while (*two == '0') two++;
|
while(*two == '0') two++;
|
||||||
|
|
||||||
/* whichever number has more digits wins */
|
/* whichever number has more digits wins */
|
||||||
if (strlen(one) > strlen(two)) {
|
if(strlen(one) > strlen(two)) {
|
||||||
ret = 1;
|
ret = 1;
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
if (strlen(two) > strlen(one)) {
|
if(strlen(two) > strlen(one)) {
|
||||||
ret = -1;
|
ret = -1;
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
@ -176,7 +176,7 @@ static int rpmvercmp(const char *a, const char *b)
|
|||||||
/* if they are equal because there might be more segments to */
|
/* if they are equal because there might be more segments to */
|
||||||
/* compare */
|
/* compare */
|
||||||
rc = strcmp(one, two);
|
rc = strcmp(one, two);
|
||||||
if (rc) {
|
if(rc) {
|
||||||
ret = rc < 1 ? -1 : 1;
|
ret = rc < 1 ? -1 : 1;
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
@ -191,7 +191,7 @@ static int rpmvercmp(const char *a, const char *b)
|
|||||||
/* this catches the case where all numeric and alpha segments have */
|
/* this catches the case where all numeric and alpha segments have */
|
||||||
/* compared identically but the segment separating characters were */
|
/* compared identically but the segment separating characters were */
|
||||||
/* different */
|
/* different */
|
||||||
if ((!*one) && (!*two)) {
|
if((!*one) && (!*two)) {
|
||||||
ret = 0;
|
ret = 0;
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
@ -202,7 +202,7 @@ static int rpmvercmp(const char *a, const char *b)
|
|||||||
* - if one is an alpha, two is newer.
|
* - if one is an alpha, two is newer.
|
||||||
* - otherwise one is newer.
|
* - otherwise one is newer.
|
||||||
* */
|
* */
|
||||||
if ( (!*one && !isalpha((int)*two))
|
if( (!*one && !isalpha((int)*two))
|
||||||
|| isalpha((int)*one) ) {
|
|| isalpha((int)*one) ) {
|
||||||
ret = -1;
|
ret = -1;
|
||||||
} else {
|
} else {
|
||||||
|
@ -423,7 +423,7 @@ void cb_progress(alpm_progress_t event, const char *pkgname, int percent,
|
|||||||
prevcurrent = current;
|
prevcurrent = current;
|
||||||
|
|
||||||
/* set text of message to display */
|
/* set text of message to display */
|
||||||
switch (event) {
|
switch(event) {
|
||||||
case ALPM_PROGRESS_ADD_START:
|
case ALPM_PROGRESS_ADD_START:
|
||||||
opr = _("installing");
|
opr = _("installing");
|
||||||
break;
|
break;
|
||||||
|
@ -229,7 +229,7 @@ static int sync_cleancache(int level)
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (level <= 1) {
|
if(level <= 1) {
|
||||||
static const char * const glob_skips[] = {
|
static const char * const glob_skips[] = {
|
||||||
/* skip signature files - they are removed with their package file */
|
/* skip signature files - they are removed with their package file */
|
||||||
"*.sig",
|
"*.sig",
|
||||||
|
@ -205,7 +205,7 @@ static int splitfile(FILE *stream, struct buffer_t *buffer, struct list_t *list)
|
|||||||
|
|
||||||
while(!feof(stream)) {
|
while(!feof(stream)) {
|
||||||
/* check if a read of BUFSIZ chars will overflow */
|
/* check if a read of BUFSIZ chars will overflow */
|
||||||
if (buffer->len + BUFSIZ + 1 >= buffer->maxlen) {
|
if(buffer->len + BUFSIZ + 1 >= buffer->maxlen) {
|
||||||
if(buffer_grow(buffer) != 0) {
|
if(buffer_grow(buffer) != 0) {
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user