diff --git a/ChangeLog b/ChangeLog
index fde8afe3..628580bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-06-07  Benoît Dejean  <tazforever@dlfp.org>
+
+	* lib/parameter.c:
+	* support/popt.c: (poptGetContext): Cleaned.
+	
+	* support/vsnprintf.c: s/strncpy/g_strlcpy
+
 2004-05-28  Benoît Dejean <TazForEver@free.fr>
 
 	* examples/*: Added missing #include.
diff --git a/lib/parameter.c b/lib/parameter.c
index 83a8bfe7..a8167309 100644
--- a/lib/parameter.c
+++ b/lib/parameter.c
@@ -26,7 +26,7 @@
 
 #define _write_data(ptr,size)	\
 	if ((data_ptr == NULL) || (data_size < size)) return -size; \
-	if (ptr == NULL) { strcpy (data_ptr, ""); return 1; } \
+	if (ptr == NULL) { char * const p = data_ptr; *p = '\0'; return 1; } \
 	memcpy (data_ptr, ptr, size);	\
 	return size;