From 6134867c8a49f0f27c8d27dd677407c210ef500c Mon Sep 17 00:00:00 2001 From: cheesecrust Date: Wed, 23 Oct 2024 12:29:48 +0900 Subject: [PATCH] INTERNAL: do_lqdetect_write method simple --- lqdetect.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/lqdetect.c b/lqdetect.c index 9083759e..d0deb0cb 100644 --- a/lqdetect.c +++ b/lqdetect.c @@ -131,29 +131,24 @@ static void do_lqdetect_write(char *client_ip, char *key, char *bufptr = buffer->data + buffer->offset; uint32_t nwrite, length, keylen = strlen(key); char keybuf[251]; + char *keyptr = key; if (keylen > 250) { /* long key string */ - keylen = snprintf(keybuf, sizeof(keybuf), "%.*s...%.*s", 124, key, 123, (key+(keylen - 123))); - } else { /* short key string */ - keylen = snprintf(keybuf, sizeof(keybuf), "%s", key); + keylen = snprintf(keybuf, sizeof(keybuf), "%.*s...%.*s", 124, key, 123, (key+keylen-123)); + keyptr = keybuf; } gettimeofday(&val, NULL); ptm = localtime(&val.tv_sec); length = ((nsaved+1) * LQ_INPUT_SIZE) - offset - 1; - snprintf(bufptr, length, "%02d:%02d:%02d.%06ld %s <%u> %s ", - ptm->tm_hour, ptm->tm_min, ptm->tm_sec, (long)val.tv_usec, client_ip, - arg->overhead, command_str[cmd]); - - nwrite = strlen(bufptr); + nwrite = snprintf(bufptr, length, "%02d:%02d:%02d.%06ld %s <%u> %s ", + ptm->tm_hour, ptm->tm_min, ptm->tm_sec, (long)val.tv_usec, + client_ip, arg->overhead, command_str[cmd]); buffer->keypos[nsaved] = offset + nwrite; buffer->keylen[nsaved] = keylen; - length -= nwrite; - bufptr += nwrite; - snprintf(bufptr, length, "%s %s\n", keybuf, arg->query); - nwrite += strlen(bufptr); + nwrite += snprintf(bufptr + nwrite, length - nwrite, "%s %s\n", keyptr, arg->query); buffer->offset += nwrite; lqdetect.arg[cmd][nsaved] = *arg; buffer->nsaved += 1;