diff options
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/cleanupdelta.c | 2 | ||||
| -rw-r--r-- | src/util/pactree.c | 18 | ||||
| -rw-r--r-- | src/util/testdb.c | 20 | ||||
| -rw-r--r-- | src/util/testpkg.c | 6 | ||||
| -rw-r--r-- | src/util/vercmp.c | 6 | 
5 files changed, 26 insertions, 26 deletions
| diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c index 71ba3a47..6388e840 100644 --- a/src/util/cleanupdelta.c +++ b/src/util/cleanupdelta.c @@ -119,7 +119,7 @@ int main(int argc, char *argv[])  	if(alpm_initialize() == -1) {  		fprintf(stderr, "cannot initialize alpm: %s\n", alpm_strerrorlast()); -		return(1); +		return 1;  	}  	/* let us get log messages from libalpm */ diff --git a/src/util/pactree.c b/src/util/pactree.c index 6a10006f..94e628b6 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -60,12 +60,12 @@ static int alpm_local_init(void)  	ret = alpm_initialize();  	if(ret != 0) { -		return(ret); +		return ret;  	}  	ret = alpm_option_set_root(ROOTDIR);  	if(ret != 0) { -		return(ret); +		return ret;  	}  	if(dbpath) { @@ -74,15 +74,15 @@ static int alpm_local_init(void)  		ret = alpm_option_set_dbpath(DBPATH);  	}  	if(ret != 0) { -		return(ret); +		return ret;  	}  	db_local = alpm_option_get_localdb();  	if(!db_local) { -		return(1); +		return 1;  	} -	return(0); +	return 0;  }  static int parse_options(int argc, char *argv[]) @@ -137,12 +137,12 @@ static int parse_options(int argc, char *argv[])  			case 'h':  			case '?':  			default: -				return(1); +				return 1;  		}  	}  	if(!argv[optind]) { -		return(1); +		return 1;  	}  	if(!color) { @@ -159,7 +159,7 @@ static int parse_options(int argc, char *argv[])  		indent_size  = 0;  	} -	return(0); +	return 0;  }  static void usage(void) @@ -366,7 +366,7 @@ int main(int argc, char *argv[])  finish:  	cleanup(); -	return(ret); +	return ret;  }  /* vim: set ts=2 sw=2 noet: */ diff --git a/src/util/testdb.c b/src/util/testdb.c index 0436a23f..3d4fa6ae 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -63,7 +63,7 @@ static int check_localdb_files(void)  	snprintf(path, sizeof(path), "%slocal", dbpath);  	if(!(dir = opendir(path))) {  		fprintf(stderr, "error : %s : %s\n", path, strerror(errno)); -		return(1); +		return 1;  	}  	while ((ent = readdir(dir)) != NULL) { @@ -85,10 +85,10 @@ static int check_localdb_files(void)  	}  	if(closedir(dir)) {  		fprintf(stderr, "error closing dbpath : %s\n", strerror(errno)); -		return(1); +		return 1;  	} -	return(ret); +	return ret;  }  static int checkdeps(alpm_list_t *pkglist) @@ -107,7 +107,7 @@ static int checkdeps(alpm_list_t *pkglist)  		ret++;  	}  	FREELIST(data); -	return(ret); +	return ret;  }  static int checkconflicts(alpm_list_t *pkglist) @@ -123,7 +123,7 @@ static int checkconflicts(alpm_list_t *pkglist)  		ret++;  	}  	FREELIST(data); -	return(ret); +	return ret;  }  static int check_localdb(void) { @@ -133,7 +133,7 @@ static int check_localdb(void) {  	ret = check_localdb_files();  	if(ret) { -		return(ret); +		return ret;  	}  	db = alpm_option_get_localdb(); @@ -145,7 +145,7 @@ static int check_localdb(void) {  	pkglist = alpm_db_get_pkgcache(db);  	ret += checkdeps(pkglist);  	ret += checkconflicts(pkglist); -	return(ret); +	return ret;  }  static int check_syncdbs(alpm_list_t *dbnames) { @@ -169,7 +169,7 @@ static int check_syncdbs(alpm_list_t *dbnames) {  cleanup:  	alpm_list_free(syncpkglist); -	return(ret); +	return ret;  }  static void usage(void) { @@ -206,7 +206,7 @@ int main(int argc, char *argv[])  	if(alpm_initialize() == -1) {  		fprintf(stderr, "cannot initialize alpm: %s\n", alpm_strerrorlast()); -		return(EXIT_FAILURE); +		return EXIT_FAILURE;  	}  	/* let us get log messages from libalpm */ @@ -214,7 +214,7 @@ int main(int argc, char *argv[])  	if(alpm_option_set_dbpath(dbpath) != 0) {  		fprintf(stderr, "cannot set dbpath: %s\n", alpm_strerrorlast()); -		return(EXIT_FAILURE); +		return EXIT_FAILURE;  	}  	if(!dbnames) { diff --git a/src/util/testpkg.c b/src/util/testpkg.c index d0d9cac1..e562dde2 100644 --- a/src/util/testpkg.c +++ b/src/util/testpkg.c @@ -44,12 +44,12 @@ int main(int argc, char *argv[])  	if(argc != 2) {  		fprintf(stderr, "usage: %s <package file>\n", BASENAME); -		return(1); +		return 1;  	}  	if(alpm_initialize() == -1) {  		fprintf(stderr, "cannot initialize alpm: %s\n", alpm_strerrorlast()); -		return(1); +		return 1;  	}  	/* let us get log messages from libalpm */ @@ -79,5 +79,5 @@ int main(int argc, char *argv[])  		fprintf(stderr, "error releasing alpm: %s\n", alpm_strerrorlast());  	} -	return(retval); +	return retval;  } diff --git a/src/util/vercmp.c b/src/util/vercmp.c index adb5a42a..88cf49a6 100644 --- a/src/util/vercmp.c +++ b/src/util/vercmp.c @@ -45,13 +45,13 @@ int main(int argc, char *argv[])  	if(argc == 1) {  		usage(); -		return(2); +		return 2;  	}  	if(argc > 1 &&  			(strcmp(argv[1], "-h") == 0 || strcmp(argv[1], "--help") == 0  			 || strcmp(argv[1], "--usage") == 0)) {  		usage(); -		return(0); +		return 0;  	}  	if(argc > 2) {  		s2 = argv[2]; @@ -62,5 +62,5 @@ int main(int argc, char *argv[])  	ret = alpm_pkg_vercmp(s1, s2);  	printf("%d\n", ret); -	return(EXIT_SUCCESS); +	return EXIT_SUCCESS;  } | 
