Mailing List Archive

Author: phk
Date: 2007-08-05 21:52:23 +0200 (Sun, 05 Aug 2007)
New Revision: 1796

Modified:
trunk/varnish-cache/bin/varnishd/mgt_param.c
Log:
Introduce a "replace()" function to replace a malloc'ed string.


Modified: trunk/varnish-cache/bin/varnishd/mgt_param.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_param.c 2007-08-05 19:37:44 UTC (rev 1795)
+++ trunk/varnish-cache/bin/varnishd/mgt_param.c 2007-08-05 19:52:23 UTC (rev 1796)
@@ -65,6 +65,18 @@

static struct params master;

+/* XXX: Far too generic to live here ? */
+static void
+replace(char **p, const char *q)
+{
+
+ AN(*q);
+ if (*p != NULL)
+ free(*p);
+ *p = strdup(q);
+ AN(*p);
+}
+
/*--------------------------------------------------------------------*/

static void
@@ -156,21 +168,14 @@
cli_result(cli, CLIS_PARAM);
return;
}
- if (master.user)
- free(master.user);
- master.user = strdup(pw->pw_name);
- AN(master.user);
+ replace(&master.user, pw->pw_name);
master.uid = pw->pw_uid;

/* set group to user's primary group */
- if (master.group)
- free(master.group);
if ((gr = getgrgid(pw->pw_gid)) != NULL &&
(gr = getgrnam(gr->gr_name)) != NULL &&
- gr->gr_gid == pw->pw_gid) {
- master.group = strdup(gr->gr_name);
- AN(master.group);
- }
+ gr->gr_gid == pw->pw_gid)
+ replace(&master.group, gr->gr_name);
master.gid = pw->pw_gid;
} else if (master.user) {
cli_out(cli, "%s (%d)", master.user, (int)master.uid);
@@ -193,10 +198,7 @@
cli_result(cli, CLIS_PARAM);
return;
}
- if (master.group)
- free(master.group);
- master.group = strdup(gr->gr_name);
- AN(master.group);
+ replace(&master.group, gr->gr_name);
master.gid = gr->gr_gid;
} else if (master.group) {
cli_out(cli, "%s (%d)", master.group, (int)master.gid);
@@ -428,9 +430,7 @@
return;
}

- free(master.listen_address);
- master.listen_address = strdup(arg);
- AN(master.listen_address);
+ replace(&master.listen_address, arg);

clean_listen_sock_head(&heritage.socks);
heritage.nsocks = 0;