From 3d4656c0204956847a62c95b0f28747d7a0c2c05 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Tue, 6 Dec 2011 23:37:32 -0500 Subject: code syntax cleanup As per HACKING file, we use 'CTRL(' rather than 'CTRL (' Signed-off-by: Dave Reisner Signed-off-by: Dan McGee --- lib/libalpm/deps.c | 2 +- lib/libalpm/util.c | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) (limited to 'lib/libalpm') diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 89f6d691..9f7e9028 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -395,7 +395,7 @@ int _alpm_depcmp(alpm_pkg_t *pkg, alpm_depend_t *dep) /* any version will satisfy the requirement */ satisfy = (provision->name_hash == dep->name_hash && strcmp(provision->name, dep->name) == 0); - } else if (provision->mod == ALPM_DEP_MOD_EQ) { + } else if(provision->mod == ALPM_DEP_MOD_EQ) { /* provision specifies a version, so try it out */ satisfy = (provision->name_hash == dep->name_hash && strcmp(provision->name, dep->name) == 0 diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 96e1ef66..4eeb0cd7 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -942,7 +942,7 @@ char SYMEXPORT *alpm_compute_md5sum(const char *filename) } /* Convert the result to something readable */ - for (i = 0; i < 16; i++) { + for(i = 0; i < 16; i++) { int pos = i * 2; /* high 4 bits are first digit, low 4 are second */ md5sum[pos] = hex_digits[output[i] >> 4]; @@ -975,7 +975,7 @@ char SYMEXPORT *alpm_compute_sha256sum(const char *filename) } /* Convert the result to something readable */ - for (i = 0; i < 32; i++) { + for(i = 0; i < 32; i++) { int pos = i * 2; /* high 4 bits are first digit, low 4 are second */ sha256sum[pos] = hex_digits[output[i] >> 4]; @@ -1216,13 +1216,13 @@ off_t _alpm_strtoofft(const char *line) return (off_t)-1; } result = strtoull(line, &end, 10); - if (result == 0 && end == line) { + if(result == 0 && end == line) { /* line was not a number */ return (off_t)-1; - } else if (result == ULLONG_MAX && errno == ERANGE) { + } else if(result == ULLONG_MAX && errno == ERANGE) { /* line does not fit in unsigned long long */ return (off_t)-1; - } else if (*end) { + } else if(*end) { /* line began with a number but has junk left over at the end */ return (off_t)-1; } @@ -1251,14 +1251,14 @@ alpm_time_t _alpm_parsedate(const char *line) } result = strtoll(line, &end, 10); - if (result == 0 && end == line) { + if(result == 0 && end == line) { /* line was not a number */ errno = EINVAL; return 0; - } else if (errno == ERANGE) { + } else if(errno == ERANGE) { /* line does not fit in long long */ return 0; - } else if (*end) { + } else if(*end) { /* line began with a number but has junk left over at the end */ errno = EINVAL; return 0; @@ -1281,7 +1281,7 @@ int _alpm_access(alpm_handle_t *handle, const char *dir, const char *file, int a size_t len = 0; int ret = 0; - if (dir) { + if(dir) { char *check_path; len = strlen(dir) + strlen(file) + 1; @@ -1296,19 +1296,19 @@ int _alpm_access(alpm_handle_t *handle, const char *dir, const char *file, int a } if(ret != 0) { - if (amode & R_OK) { + if(amode & R_OK) { _alpm_log(handle, ALPM_LOG_DEBUG, "\"%s%s\" is not readable: %s\n", dir, file, strerror(errno)); } - if (amode & W_OK) { + if(amode & W_OK) { _alpm_log(handle, ALPM_LOG_DEBUG, "\"%s%s\" is not writable: %s\n", dir, file, strerror(errno)); } - if (amode & X_OK) { + if(amode & X_OK) { _alpm_log(handle, ALPM_LOG_DEBUG, "\"%s%s\" is not executable: %s\n", dir, file, strerror(errno)); } - if (amode == F_OK) { + if(amode == F_OK) { _alpm_log(handle, ALPM_LOG_DEBUG, "\"%s%s\" does not exist: %s\n", dir, file, strerror(errno)); } -- cgit v1.2.3