From 30911fa6897d65a6ead1a9bf075a5ec31fbcb624 Mon Sep 17 00:00:00 2001 From: Ryota Ozaki Date: Tue, 29 May 2012 15:06:20 -0700 Subject: [PATCH] --- yaml --- r: 308831 b: refs/heads/master c: f62388187207bea83f1865d507bf892a1f9152c3 h: refs/heads/master i: 308829: 40606109df718f78bccb785b487841cd59d1f73f 308827: 6c538670add5e1cd7b183cbfde8ce509fbd15707 308823: d461c25345df4e7ee1c95d81596c19aed583969c 308815: 585f5700abdab15d1b22f0ac5ba7cf73fa7e8c12 308799: b260600ac51792ea8c7a1225ff0099d3b3c9a76b v: v3 --- [refs] | 2 +- trunk/drivers/base/node.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 3a647824073b..6a7d17caa07a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 23b9da55c5b0feb484bd5e8615f4eb1ce4169453 +refs/heads/master: f62388187207bea83f1865d507bf892a1f9152c3 diff --git a/trunk/drivers/base/node.c b/trunk/drivers/base/node.c index 90aa2a11a933..af1a177216f1 100644 --- a/trunk/drivers/base/node.c +++ b/trunk/drivers/base/node.c @@ -592,11 +592,9 @@ static ssize_t print_nodes_state(enum node_states state, char *buf) { int n; - n = nodelist_scnprintf(buf, PAGE_SIZE, node_states[state]); - if (n > 0 && PAGE_SIZE > n + 1) { - *(buf + n++) = '\n'; - *(buf + n++) = '\0'; - } + n = nodelist_scnprintf(buf, PAGE_SIZE-2, node_states[state]); + buf[n++] = '\n'; + buf[n] = '\0'; return n; }