aboutsummaryrefslogtreecommitdiffstats
path: root/rsync.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2006-02-06 09:00:37 +0000
committerWayne Davison <wayned@samba.org>2006-02-06 09:00:37 +0000
commit2a62f5ee1933a98a4eb3b62cbd4ec490fc14f65a (patch)
tree80b9852a926e2639878177e960081693cd40012d /rsync.c
parentf9cfaae952612d37b287efa607ac35beb92f7655 (diff)
downloadandroid_external_rsync-2a62f5ee1933a98a4eb3b62cbd4ec490fc14f65a.tar.gz
android_external_rsync-2a62f5ee1933a98a4eb3b62cbd4ec490fc14f65a.tar.bz2
android_external_rsync-2a62f5ee1933a98a4eb3b62cbd4ec490fc14f65a.zip
Added "const" to the default_charset() return.
Diffstat (limited to 'rsync.c')
-rw-r--r--rsync.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/rsync.c b/rsync.c
index 8595d517..28d9612c 100644
--- a/rsync.c
+++ b/rsync.c
@@ -53,12 +53,12 @@ extern struct stats stats;
#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
iconv_t ic_chck = (iconv_t)-1;
-static char *default_charset(void)
+static const char *default_charset(void)
{
#if defined HAVE_LIBCHARSET_H && defined HAVE_LOCALE_CHARSET
return locale_charset();
#elif defined HAVE_LANGINFO_H && defined HAVE_NL_LANGINFO
- char *def = nl_langinfo(CODESET);
+ const char *def = nl_langinfo(CODESET);
if (strcmp(def, "646") == 0) /* Solaris brain-damage */
return "ascii";
return def;
@@ -69,7 +69,7 @@ static char *default_charset(void)
void setup_iconv()
{
- char *defset = default_charset();
+ const char *defset = default_charset();
if (!am_server
&& (ic_chck = iconv_open(defset, defset)) == (iconv_t)-1) {