Signed-off-by: Gerardo Exequiel Pozzi
---
lib/libalpm/be_package.c | 2 +-
lib/libalpm/filelist.c | 2 +-
lib/libalpm/signing.c | 2 +-
lib/libalpm/util.c | 2 +-
lib/libalpm/version.c | 42 +++++++++++++++++++++---------------------
src/pacman/callback.c | 2 +-
src/pacman/sync.c | 2 +-
src/util/pacsort.c | 2 +-
8 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c
index c3486a8..18fc14a 100644
--- a/lib/libalpm/be_package.c
+++ b/lib/libalpm/be_package.c
@@ -336,7 +336,7 @@ int _alpm_pkg_validate_internal(alpm_handle_t *handle,
}
}
- if (validation && !*validation) {
+ if(validation && !*validation) {
*validation = ALPM_PKG_VALIDATION_NONE;
}
diff --git a/lib/libalpm/filelist.c b/lib/libalpm/filelist.c
index f4cdddc..f29bb7c 100644
--- a/lib/libalpm/filelist.c
+++ b/lib/libalpm/filelist.c
@@ -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 */
- if (!exists) {
+ if(!exists) {
for((*i)++; *i < files->count; (*i)++) {
char *f = files->files[*i].name;
size_t f_len = strlen(f);
diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c
index 606b6a6..ec9aa99 100644
--- a/lib/libalpm/signing.c
+++ b/lib/libalpm/signing.c
@@ -293,7 +293,7 @@ static int key_search(alpm_handle_t *handle, const char *fpr,
pgpkey->length = key->subkeys->length;
pgpkey->revoked = key->subkeys->revoked;
- switch (key->subkeys->pubkey_algo) {
+ switch(key->subkeys->pubkey_algo) {
case GPGME_PK_RSA:
case GPGME_PK_RSA_E:
case GPGME_PK_RSA_S:
diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c
index 22953ba..a8ee12c 100644
--- a/lib/libalpm/util.c
+++ b/lib/libalpm/util.c
@@ -858,7 +858,7 @@ static char *hex_representation(unsigned char *bytes, size_t size)
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 + 1] = hex_digits[bytes[i] & 0x0f];
}
diff --git a/lib/libalpm/version.c b/lib/libalpm/version.c
index 59a7a4e..f25b279 100644
--- a/lib/libalpm/version.c
+++ b/lib/libalpm/version.c
@@ -46,7 +46,7 @@ static void parseEVR(char *evr, const char **ep, const char **vp,
s = evr;
/* s points to epoch terminator */
- while (*s && isdigit(*s)) s++;
+ while(*s && isdigit(*s)) s++;
/* se points to version terminator */
se = strrchr(s, '-');
@@ -100,15 +100,15 @@ static int rpmvercmp(const char *a, const char *b)
two = ptr2 = str2;
/* loop through each version segment of str1 and str2 and compare them */
- while (*one && *two) {
- while (*one && !isalnum((int)*one)) one++;
- while (*two && !isalnum((int)*two)) two++;
+ while(*one && *two) {
+ while(*one && !isalnum((int)*one)) one++;
+ while(*two && !isalnum((int)*two)) two++;
/* 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 ((one - ptr1) != (two - ptr2)) {
+ if((one - ptr1) != (two - ptr2)) {
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 */
/* leave one and two pointing to the start of the alpha or numeric */
/* segment and walk ptr1 and ptr2 to end of segment */
- if (isdigit((int)*ptr1)) {
- while (*ptr1 && isdigit((int)*ptr1)) ptr1++;
- while (*ptr2 && isdigit((int)*ptr2)) ptr2++;
+ if(isdigit((int)*ptr1)) {
+ while(*ptr1 && isdigit((int)*ptr1)) ptr1++;
+ while(*ptr2 && isdigit((int)*ptr2)) ptr2++;
isnum = 1;
} else {
- while (*ptr1 && isalpha((int)*ptr1)) ptr1++;
- while (*ptr2 && isalpha((int)*ptr2)) ptr2++;
+ while(*ptr1 && isalpha((int)*ptr1)) ptr1++;
+ while(*ptr2 && isalpha((int)*ptr2)) ptr2++;
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 */
/* the first string has a non-null segment */
- if (one == ptr1) {
+ if(one == ptr1) {
ret = -1; /* arbitrary */
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) */
/* numeric segments are always newer than alpha segments */
/* XXX See patch #60884 (and details) from bugzilla #50977. */
- if (two == ptr2) {
+ if(two == ptr2) {
ret = isnum ? 1 : -1;
goto cleanup;
}
- if (isnum) {
+ if(isnum) {
/* this used to be done by converting the digit segments */
/* to ints using atoi() - it's changed because long */
/* digit segments can overflow an int - this should fix that. */
/* throw away any leading zeros - it's a number, right? */
- while (*one == '0') one++;
- while (*two == '0') two++;
+ while(*one == '0') one++;
+ while(*two == '0') two++;
/* whichever number has more digits wins */
- if (strlen(one) > strlen(two)) {
+ if(strlen(one) > strlen(two)) {
ret = 1;
goto cleanup;
}
- if (strlen(two) > strlen(one)) {
+ if(strlen(two) > strlen(one)) {
ret = -1;
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 */
/* compare */
rc = strcmp(one, two);
- if (rc) {
+ if(rc) {
ret = rc < 1 ? -1 : 1;
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 */
/* compared identically but the segment separating characters were */
/* different */
- if ((!*one) && (!*two)) {
+ if((!*one) && (!*two)) {
ret = 0;
goto cleanup;
}
@@ -202,7 +202,7 @@ static int rpmvercmp(const char *a, const char *b)
* - if one is an alpha, two is newer.
* - otherwise one is newer.
* */
- if ( (!*one && !isalpha((int)*two))
+ if( (!*one && !isalpha((int)*two))
|| isalpha((int)*one) ) {
ret = -1;
} else {
diff --git a/src/pacman/callback.c b/src/pacman/callback.c
index 78dcd63..f53f59c 100644
--- a/src/pacman/callback.c
+++ b/src/pacman/callback.c
@@ -423,7 +423,7 @@ void cb_progress(alpm_progress_t event, const char *pkgname, int percent,
prevcurrent = current;
/* set text of message to display */
- switch (event) {
+ switch(event) {
case ALPM_PROGRESS_ADD_START:
opr = _("installing");
break;
diff --git a/src/pacman/sync.c b/src/pacman/sync.c
index b25f7a5..fef2940 100644
--- a/src/pacman/sync.c
+++ b/src/pacman/sync.c
@@ -229,7 +229,7 @@ static int sync_cleancache(int level)
continue;
}
- if (level <= 1) {
+ if(level <= 1) {
static const char * const glob_skips[] = {
/* skip signature files - they are removed with their package file */
"*.sig",
diff --git a/src/util/pacsort.c b/src/util/pacsort.c
index 7275cc7..c7b8c94 100644
--- a/src/util/pacsort.c
+++ b/src/util/pacsort.c
@@ -205,7 +205,7 @@ static int splitfile(FILE *stream, struct buffer_t *buffer, struct list_t *list)
while(!feof(stream)) {
/* 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) {
return 1;
}
--
1.8.1