From d35f2725bf19b40d1245a999784aa8b6a7d828d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?mehmet=20furkan=20=C5=9Fahin?= Date: Tue, 8 May 2018 18:20:05 +0300 Subject: [PATCH] valgrind tests fix --- .../distributed/connection/connection_management.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/backend/distributed/connection/connection_management.c b/src/backend/distributed/connection/connection_management.c index 8f845c096..aa610ece1 100644 --- a/src/backend/distributed/connection/connection_management.c +++ b/src/backend/distributed/connection/connection_management.c @@ -818,8 +818,7 @@ DefaultCitusNoticeProcessor(void *arg, const char *message) MultiConnection *connection = (MultiConnection *) arg; char *nodeName = connection->hostname; uint32 nodePort = connection->port; - char *chompedMessage = pchomp(message); - char *trimmedMessage = TrimLogLevel(chompedMessage); + char *trimmedMessage = TrimLogLevel(message); char *level = strtok((char *) message, ":"); ereport(CitusNoticeLogLevel, (errmsg("%s", trimmedMessage), @@ -829,7 +828,7 @@ DefaultCitusNoticeProcessor(void *arg, const char *message) /* - * TrimLogLevel makes a copy of the string with the leading log level + * TrimLogLevel returns a copy of the string with the leading log level * and spaces removed such as * From: * INFO: "normal2_102070": scanned 0 of 0 pages... @@ -839,17 +838,18 @@ DefaultCitusNoticeProcessor(void *arg, const char *message) char * TrimLogLevel(const char *message) { + char *chompedMessage = pchomp(message); size_t n; n = 0; - while (n < strlen(message) && message[n] != ':') + while (n < strlen(chompedMessage) && chompedMessage[n] != ':') { n++; } do { n++; - } while (n < strlen(message) && message[n] == ' '); + } while (n < strlen(chompedMessage) && chompedMessage[n] == ' '); - return pstrdup(message + n); + return chompedMessage + n; }