svn commit: samba r2017 - in branches/SAMBA_4_0/source: intl lib

metze at samba.org metze at samba.org
Tue Aug 24 15:38:58 GMT 2004


Author: metze
Date: 2004-08-24 15:38:57 +0000 (Tue, 24 Aug 2004)
New Revision: 2017

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source&rev=2017&nolog=1

Log:
fix compiler warnings

metze

Modified:
   branches/SAMBA_4_0/source/intl/lang_tdb.c
   branches/SAMBA_4_0/source/lib/dprintf.c


Changeset:
Modified: branches/SAMBA_4_0/source/intl/lang_tdb.c
===================================================================
--- branches/SAMBA_4_0/source/intl/lang_tdb.c	2004-08-24 13:26:31 UTC (rev 2016)
+++ branches/SAMBA_4_0/source/intl/lang_tdb.c	2004-08-24 15:38:57 UTC (rev 2017)
@@ -169,13 +169,13 @@
 /* translate a msgid to a message string in the current language 
    returns a string that must be freed by calling lang_msg_free()
 */
-const char *lang_msg(const char *msgid)
+char *lang_msg(const char *msgid)
 {
 	TDB_DATA key, data;
 
 	lang_tdb_init(NULL);
 
-	if (!tdb) return msgid;
+	if (!tdb) return strdup(msgid);
 
 	key.dptr = strdup(msgid);
 	key.dsize = strlen(msgid)+1;
@@ -189,12 +189,12 @@
 	if (!data.dptr)
 		return strdup(msgid);
 
-	return (const char *)data.dptr;
+	return data.dptr;
 }
 
 
 /* free up a string from lang_msg() */
-void lang_msg_free(const char *msgstr)
+void lang_msg_free(char *msgstr)
 {
 	if (!tdb) return;
 	free(msgstr);

Modified: branches/SAMBA_4_0/source/lib/dprintf.c
===================================================================
--- branches/SAMBA_4_0/source/lib/dprintf.c	2004-08-24 13:26:31 UTC (rev 2016)
+++ branches/SAMBA_4_0/source/lib/dprintf.c	2004-08-24 15:38:57 UTC (rev 2017)
@@ -35,7 +35,7 @@
 {
 	char *p, *p2;
 	int ret, maxlen, clen;
-	const char *msgstr;
+	char *msgstr;
 	va_list ap2;
 
 	/* do any message translations */



More information about the samba-cvs mailing list