From d22975841b065e71cb4906dc42fb25b36a0ab31d Mon Sep 17 00:00:00 2001 From: Anders Broman Date: Tue, 13 May 2008 06:55:45 +0000 Subject: Fix some of the Errors/warnings detected by checkapi. svn path=/trunk/; revision=25283 --- conditions.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'conditions.c') diff --git a/conditions.c b/conditions.c index 95b42f7bea..33d20fe229 100644 --- a/conditions.c +++ b/conditions.c @@ -70,8 +70,7 @@ condition* cnd_new(const char* class_id, ...){ g_free(cnd_ref); return NULL; } - strncpy(id, class_id, strlen(class_id)); - id[strlen(class_id)] = '\0'; + g_strlcpy(id, class_id, strlen(class_id)); cnd_ref->class_id = id; /* perform class specific initialization */ va_start(ap, class_id); @@ -147,8 +146,7 @@ gboolean cnd_register_class(const char* class_id, /* GHashTable keys need to be persistent for the lifetime of the hash table. Allocate memory and copy the class id which we use as key. */ if((key = (char*)g_malloc(strlen(class_id)+1)) == NULL) return FALSE; - strncpy(key, class_id, strlen(class_id)); - key[strlen(class_id)] = '\0'; + g_strlcpy(key, class_id, strlen(class_id)); /* initialize class structure */ if((cls = (_cnd_class*)g_malloc(sizeof(_cnd_class))) == NULL){ g_free(key); -- cgit v1.2.1