external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

aurblup: style cleanups

Browse source 
Always use two lines for if statements, use a character constant rather
than the 0 integer when NULL-terminating a string, and remove the
unnecessary NULL check before free(value)- free(NULL) is a no-op and
always safe.

Signed-off-by: Dan McGee <dan@archlinux.org>
Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
This commit is contained in:
Dan McGee 2011-10-21 15:24:04 -05:00 • committed by Lukas Fleischer
parent f5736ace65
commit 156bfbddb9
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
scripts/aurblup/aurblup.c
View file

@ -52,12 +52,13 @@ static alpm_list_t *
pkglist_append(alpm_list_t *pkglist, const char *pkgname) pkglist_append(alpm_list_t *pkglist, const char *pkgname)
{ {
int len = strcspn(pkgname, "<=>"); int len = strcspn(pkgname, "<=>");
if (!len) len = strlen(pkgname); if (!len)
len = strlen(pkgname);
char *s = malloc(len + 1); char *s = malloc(len + 1);
strncpy(s, pkgname, len); strncpy(s, pkgname, len);
s[len] = 0; s[len] = '\0';
if (alpm_list_find_str(pkglist, s)) if (alpm_list_find_str(pkglist, s))
free(s); free(s);
@ -217,10 +218,14 @@ read_config(const char *fn)
t = &mysql_host; t = &mysql_host;
u = &mysql_socket; u = &mysql_socket;
} }
else if (strstr(line, CONFIG_KEY_USER)) t = &mysql_user; else if (strstr(line, CONFIG_KEY_USER))
else if (strstr(line, CONFIG_KEY_PASSWD)) t = &mysql_passwd; t = &mysql_user;
else if (strstr(line, CONFIG_KEY_DB)) t = &mysql_db; else if (strstr(line, CONFIG_KEY_PASSWD))
else t = NULL; t = &mysql_passwd;
else if (strstr(line, CONFIG_KEY_DB))
t = &mysql_db;
else
t = NULL;
if (t) { if (t) {
strtok(line, "\""); strtok(line, "\"");
@ -280,11 +285,11 @@ init(void)
static void static void
cleanup(void) cleanup(void)
{ {
if (mysql_host) free(mysql_host); free(mysql_host);
if (mysql_socket) free(mysql_socket); free(mysql_socket);
if (mysql_user) free(mysql_user); free(mysql_user);
if (mysql_passwd) free(mysql_passwd); free(mysql_passwd);
if (mysql_db) free(mysql_db); free(mysql_db);
alpm_release(); alpm_release();
mysql_close(c); mysql_close(c);