From 335b48a53a32a3b35726da013a8c9778747821c0 Mon Sep 17 00:00:00 2001
From: Roman Tokarev <rtokarev@corp.mail.ru>
Date: Fri, 20 May 2011 16:10:35 +0400
Subject: [PATCH] Additional changes for commit
f5c4069d81aae5695a26165c6ce872b5db1d443c.
---
core/palloc.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/core/palloc.c b/core/palloc.c
index c1d3505d65..df1ee020e0 100644
--- a/core/palloc.c
+++ b/core/palloc.c
@@ -39,6 +39,8 @@
#include <tbuf.h>
#include <stat.h>
+#define PALLOC_POOL_NAME_MAXLEN 16
+
struct chunk {
uint32_t magic;
void *brk;
@@ -66,7 +68,7 @@ struct palloc_pool {
struct chunk_list_head chunks;
SLIST_ENTRY(palloc_pool) link;
size_t allocated;
- char name[16];
+ char name[PALLOC_POOL_NAME_MAXLEN];
};
SLIST_HEAD(palloc_pool_head, palloc_pool) pools;
@@ -371,8 +373,7 @@ palloc_stat(struct tbuf *buf)
void
palloc_set_name(struct palloc_pool *pool, const char *name)
{
- if (name == NULL)
- name = "undefined";
+ assert(name != NULL);
snprintf(pool->name, sizeof(pool->name), "%s", name);
}
--
GitLab