<p>Max has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12705">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Drop unused parameter<br><br>value_node_add() ignores it's first argument - let's drop it to make<br>code more compact.<br><br>Change-Id: I17c2fed4049e1c83307feda001aefc006dfbe6a3<br>---<br>M src/osysmon_ctrl.c<br>M src/osysmon_file.c<br>M src/osysmon_main.c<br>M src/osysmon_rtnl.c<br>M src/osysmon_sysinfo.c<br>M src/value_node.c<br>M src/value_node.h<br>7 files changed, 21 insertions(+), 21 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-sysmon refs/changes/05/12705/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osysmon_ctrl.c b/src/osysmon_ctrl.c</span><br><span>index 25c2b4c..4aa7a1d 100644</span><br><span>--- a/src/osysmon_ctrl.c</span><br><span>+++ b/src/osysmon_ctrl.c</span><br><span>@@ -266,7 +266,7 @@</span><br><span> static int ctrl_client_poll(struct ctrl_client *cc, struct value_node *parent)</span><br><span> {</span><br><span> struct ctrl_client_get_var *ccgv;</span><br><span style="color: hsl(0, 100%, 40%);">- struct value_node *vn_clnt = value_node_add(parent, parent, cc->cfg.name, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct value_node *vn_clnt = value_node_add(parent, cc->cfg.name, NULL);</span><br><span> </span><br><span> /* attempt to re-connect */</span><br><span> if (!cc->sch)</span><br><span>@@ -288,7 +288,7 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- value_node_add(vn_clnt, vn_clnt, ccgv->cfg.name, value);</span><br><span style="color: hsl(120, 100%, 40%);">+ value_node_add(vn_clnt, ccgv->cfg.name, value);</span><br><span> free(value); /* no talloc, this is from sscanf() */</span><br><span> }</span><br><span> return 0;</span><br><span>diff --git a/src/osysmon_file.c b/src/osysmon_file.c</span><br><span>index 3a228fa..1dec3db 100644</span><br><span>--- a/src/osysmon_file.c</span><br><span>+++ b/src/osysmon_file.c</span><br><span>@@ -82,19 +82,19 @@</span><br><span> </span><br><span> f = fopen(of->cfg.path, "r");</span><br><span> if (!f) {</span><br><span style="color: hsl(0, 100%, 40%);">- value_node_add(parent, parent, of->cfg.name, "<NOTFOUND>");</span><br><span style="color: hsl(120, 100%, 40%);">+ value_node_add(parent, of->cfg.name, "<NOTFOUND>");</span><br><span> return;</span><br><span> }</span><br><span> s = fgets(buf, sizeof(buf), f);</span><br><span> fclose(f);</span><br><span> if (s == NULL) {</span><br><span style="color: hsl(0, 100%, 40%);">- value_node_add(parent, parent, of->cfg.name, "<EMPTY>");</span><br><span style="color: hsl(120, 100%, 40%);">+ value_node_add(parent, of->cfg.name, "<EMPTY>");</span><br><span> return;</span><br><span> }</span><br><span> buf[sizeof(buf)-1] = '\0';</span><br><span> while ((nl = strrchr(buf, '\n')))</span><br><span> *nl = '\0';</span><br><span style="color: hsl(0, 100%, 40%);">- value_node_add(parent, parent, of->cfg.name, buf);</span><br><span style="color: hsl(120, 100%, 40%);">+ value_node_add(parent, of->cfg.name, buf);</span><br><span> }</span><br><span> </span><br><span> /***********************************************************************</span><br><span>@@ -153,7 +153,7 @@</span><br><span> struct value_node *vn_file;</span><br><span> struct osysmon_file *of;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- vn_file = value_node_add(parent, parent, "file", NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ vn_file = value_node_add(parent, "file", NULL);</span><br><span> </span><br><span> llist_for_each_entry(of, &g_oss->files, list)</span><br><span> osysmon_file_read(of, vn_file);</span><br><span>diff --git a/src/osysmon_main.c b/src/osysmon_main.c</span><br><span>index 486ee8f..82df61f 100644</span><br><span>--- a/src/osysmon_main.c</span><br><span>+++ b/src/osysmon_main.c</span><br><span>@@ -229,7 +229,7 @@</span><br><span> }</span><br><span> </span><br><span> while (1) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct value_node *root = value_node_add(g_oss, NULL, "root", NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct value_node *root = value_node_add(NULL, "root", NULL);</span><br><span> osysmon_sysinfo_poll(root);</span><br><span> osysmon_ctrl_poll(root);</span><br><span> osysmon_rtnl_poll(root);</span><br><span>diff --git a/src/osysmon_rtnl.c b/src/osysmon_rtnl.c</span><br><span>index 94d8bf9..9fd4251 100644</span><br><span>--- a/src/osysmon_rtnl.c</span><br><span>+++ b/src/osysmon_rtnl.c</span><br><span>@@ -216,17 +216,17 @@</span><br><span> uint8_t *hwaddr = mnl_attr_get_payload(tb[IFLA_ADDRESS]);</span><br><span> snprintf(buf, sizeof(buf), "%02x:%02x:%02x:%02x:%02x:%02x",</span><br><span> hwaddr[0], hwaddr[1], hwaddr[2], hwaddr[3], hwaddr[4], hwaddr[5]);</span><br><span style="color: hsl(0, 100%, 40%);">- value_node_add(vn_if, vn_if, "hwaddr", buf);</span><br><span style="color: hsl(120, 100%, 40%);">+ value_node_add(vn_if, "hwaddr", buf);</span><br><span> }</span><br><span> if (ifm->ifi_flags & IFF_RUNNING) </span><br><span style="color: hsl(0, 100%, 40%);">- value_node_add(vn_if, vn_if, "running", "true");</span><br><span style="color: hsl(120, 100%, 40%);">+ value_node_add(vn_if, "running", "true");</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- value_node_add(vn_if, vn_if, "running", "false");</span><br><span style="color: hsl(120, 100%, 40%);">+ value_node_add(vn_if, "running", "false");</span><br><span> </span><br><span> if (ifm->ifi_flags & IFF_UP)</span><br><span style="color: hsl(0, 100%, 40%);">- value_node_add(vn_if, vn_if, "up", "true");</span><br><span style="color: hsl(120, 100%, 40%);">+ value_node_add(vn_if, "up", "true");</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- value_node_add(vn_if, vn_if, "up", "false");</span><br><span style="color: hsl(120, 100%, 40%);">+ value_node_add(vn_if, "up", "false");</span><br><span> </span><br><span> return MNL_CB_OK;</span><br><span> }</span><br><span>@@ -313,7 +313,7 @@</span><br><span> struct in_addr *addr = mnl_attr_get_payload(tb[IFA_ADDRESS]);</span><br><span> char out[INET_ADDRSTRLEN+32];</span><br><span> snprintf(out, sizeof(out), "%s/%u", inet_ntoa(*addr), ifa->ifa_prefixlen);</span><br><span style="color: hsl(0, 100%, 40%);">- value_node_add(vn_if, vn_if, "ip", out);</span><br><span style="color: hsl(120, 100%, 40%);">+ value_node_add(vn_if, "ip", out);</span><br><span> }</span><br><span> </span><br><span> return MNL_CB_OK;</span><br><span>@@ -404,7 +404,7 @@</span><br><span> if (!g_oss->rcs)</span><br><span> g_oss->rcs = rtnl_init(NULL);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- vn_net = value_node_add(parent, parent, "netdev", NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ vn_net = value_node_add(parent, "netdev", NULL);</span><br><span> </span><br><span> if (!g_oss->rcs)</span><br><span> return -1;</span><br><span>diff --git a/src/osysmon_sysinfo.c b/src/osysmon_sysinfo.c</span><br><span>index 50616bc..85d9ee9 100644</span><br><span>--- a/src/osysmon_sysinfo.c</span><br><span>+++ b/src/osysmon_sysinfo.c</span><br><span>@@ -63,7 +63,7 @@</span><br><span> char buf[32];</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- vn_sysinfo = value_node_add(parent, parent, "sysinfo", NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ vn_sysinfo = value_node_add(parent, "sysinfo", NULL);</span><br><span> </span><br><span> rc = sysinfo(&si);</span><br><span> if (rc < 0)</span><br><span>@@ -72,17 +72,17 @@</span><br><span> /* Load Factor 1/5/15min */</span><br><span> snprintf(buf, sizeof(buf), "%.2f/%.2f/%.2f",</span><br><span> loadfac(si.loads[0]), loadfac(si.loads[1]), loadfac(si.loads[2]));</span><br><span style="color: hsl(0, 100%, 40%);">- value_node_add(vn_sysinfo, vn_sysinfo, "load", buf);</span><br><span style="color: hsl(120, 100%, 40%);">+ value_node_add(vn_sysinfo, "load", buf);</span><br><span> </span><br><span> /* RAM information (total/free/sared) in megabytes */</span><br><span> snprintf(buf, sizeof(buf), "%lu/%lu/%lu",</span><br><span> to_mbytes(si.totalram), to_mbytes(si.freeram), to_mbytes(si.sharedram));</span><br><span style="color: hsl(0, 100%, 40%);">- value_node_add(vn_sysinfo, vn_sysinfo, "ram", buf);</span><br><span style="color: hsl(120, 100%, 40%);">+ value_node_add(vn_sysinfo, "ram", buf);</span><br><span> </span><br><span> /* uptime in days/hours/minutes/seconds */</span><br><span> snprintf(buf, sizeof(buf), "%lud %02lu:%02lu:%02lu", to_days(si.uptime),</span><br><span> to_hours(si.uptime), to_minutes(si.uptime), to_seconds(si.uptime));</span><br><span style="color: hsl(0, 100%, 40%);">- value_node_add(vn_sysinfo, vn_sysinfo, "uptime", buf);</span><br><span style="color: hsl(120, 100%, 40%);">+ value_node_add(vn_sysinfo, "uptime", buf);</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>diff --git a/src/value_node.c b/src/value_node.c</span><br><span>index 38fb5c7..9143451 100644</span><br><span>--- a/src/value_node.c</span><br><span>+++ b/src/value_node.c</span><br><span>@@ -27,7 +27,7 @@</span><br><span> </span><br><span> #include "value_node.h"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct value_node *value_node_add(void *ctx, struct value_node *parent,</span><br><span style="color: hsl(120, 100%, 40%);">+struct value_node *value_node_add(struct value_node *parent,</span><br><span> const char *name, const char *value)</span><br><span> {</span><br><span> struct value_node *vn = talloc_zero(parent, struct value_node);</span><br><span>@@ -67,7 +67,7 @@</span><br><span> struct value_node *vn;</span><br><span> vn = value_node_find(parent, name);</span><br><span> if (!vn)</span><br><span style="color: hsl(0, 100%, 40%);">- vn = value_node_add(parent, parent, name, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ vn = value_node_add(parent, name, NULL);</span><br><span> return vn;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/value_node.h b/src/value_node.h</span><br><span>index b8183ba..84c3d7b 100644</span><br><span>--- a/src/value_node.h</span><br><span>+++ b/src/value_node.h</span><br><span>@@ -16,7 +16,7 @@</span><br><span> struct llist_head children;</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct value_node *value_node_add(void *ctx, struct value_node *parent,</span><br><span style="color: hsl(120, 100%, 40%);">+struct value_node *value_node_add(struct value_node *parent,</span><br><span> const char *name, const char *value);</span><br><span> struct value_node *value_node_find(struct value_node *parent, const char *name);</span><br><span> struct value_node *value_node_find_by_idx(struct value_node *parent, int idx);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12705">change 12705</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/12705"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-sysmon </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I17c2fed4049e1c83307feda001aefc006dfbe6a3 </div>
<div style="display:none"> Gerrit-Change-Number: 12705 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>