summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2009-10-11 21:19:55 +0200
committerDan McGee <dan@archlinux.org>2009-10-11 21:42:04 +0200
commit302310c5aad5ae25a1e712ca6f9de6bef73e17de (patch)
tree1bd317650960fbdc77fc5e76c12c11049cd6531a
parent4828d9ef7c7dc04eb4ad909f9204e909fbaae48f (diff)
downloadpacman-302310c5aad5ae25a1e712ca6f9de6bef73e17de.tar.gz
pacman-302310c5aad5ae25a1e712ca6f9de6bef73e17de.tar.xz
Minor scope/typing cleanups
Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--src/pacman/pacman.c4
-rw-r--r--src/pacman/util.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index ac515029..5e824f4d 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -612,7 +612,7 @@ static char *get_filename(const char *url) {
static char *get_destfile(const char *path, const char *filename) {
char *destfile;
/* len = localpath len + filename len + null */
- int len = strlen(path) + strlen(filename) + 1;
+ size_t len = strlen(path) + strlen(filename) + 1;
destfile = calloc(len, sizeof(char));
snprintf(destfile, len, "%s%s", path, filename);
@@ -622,7 +622,7 @@ static char *get_destfile(const char *path, const char *filename) {
static char *get_tempfile(const char *path, const char *filename) {
char *tempfile;
/* len = localpath len + filename len + '.part' len + null */
- int len = strlen(path) + strlen(filename) + 6;
+ size_t len = strlen(path) + strlen(filename) + 6;
tempfile = calloc(len, sizeof(char));
snprintf(tempfile, len, "%s%s.part", path, filename);
diff --git a/src/pacman/util.c b/src/pacman/util.c
index 353aae3a..0351556e 100644
--- a/src/pacman/util.c
+++ b/src/pacman/util.c
@@ -453,13 +453,13 @@ void string_display(const char *title, const char *string)
int len = 0;
if(title) {
- /* compute the length of title + a space */
- len = string_length(title) + 1;
printf("%s ", title);
}
if(string == NULL || string[0] == '\0') {
printf(_("None"));
} else {
+ /* compute the length of title + a space */
+ len = string_length(title) + 1;
indentprint(string, len);
}
printf("\n");