[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [Cluster-devel] [PATCH] dlm_controld: fix name printing error in logging



Hi,

On 25/04/14 08:21, Lidong Zhong wrote:
When the length of name_in is NAME_ID_SIZE, the last byte of the name
and a whitespace will get lost.

Signed-off-by: Lidong Zhong <lzhong suse com>
---
  dlm_controld/logging.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlm_controld/logging.c b/dlm_controld/logging.c
index 9347e43..ea879e8 100644
--- a/dlm_controld/logging.c
+++ b/dlm_controld/logging.c
@@ -122,7 +122,7 @@ static void log_save_str(int len, char *log_buf, unsigned int *point,
  void log_level(char *name_in, uint32_t level_in, const char *fmt, ...)
  {
  	va_list ap;
-	char name[NAME_ID_SIZE + 1];
+	char name[NAME_ID_SIZE + 2];
  	uint32_t level = level_in & 0x0000FFFF;
  	uint32_t extra = level_in & 0xFFFF0000;
  	int ret, pos = 0;
@@ -132,7 +132,7 @@ void log_level(char *name_in, uint32_t level_in, const char *fmt, ...)
  	memset(name, 0, sizeof(name));
if (name_in)
-		snprintf(name, NAME_ID_SIZE, "%s ", name_in);
+		snprintf(name, NAME_ID_SIZE + 2, "%s ", name_in);
ret = snprintf(log_str + pos, len - pos, "%llu %s",
  		       (unsigned long long)monotime(), name);
It seems a bit odd to use a temporary buffer here... why not just print the name directly in the second snprintf() call? Something like this:

if (name_in)

	ret = snprintf(log_str + pos, len - pos, "%llu %s ",
 		       (unsigned long long)monotime(), name_in);

    else

        ret = snprintf(log_str + pos, len - pos, "%llu ",
 		       (unsigned long long)monotime());

Or even:

	ret = snprintf(log_str + pos, len - pos, name_in ? "%llu %s " : "%llu ",
		       (unsigned long long)monotime(), name_in);


Steve.


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]