Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f9cfaae
)
Added "const" to the default_charset() return.
author
Wayne Davison
<wayned@samba.org>
Mon, 6 Feb 2006 09:00:37 +0000
(09:00 +0000)
committer
Wayne Davison
<wayned@samba.org>
Mon, 6 Feb 2006 09:00:37 +0000
(09:00 +0000)
rsync.c
patch
|
blob
|
blame
|
history
diff --git
a/rsync.c
b/rsync.c
index
8595d51
..
28d9612
100644
(file)
--- 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;
#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
iconv_t ic_chck = (iconv_t)-1;
-static char *default_charset(void)
+static c
onst c
har *default_charset(void)
{
#if defined HAVE_LIBCHARSET_H && defined HAVE_LOCALE_CHARSET
return locale_charset();
#elif defined HAVE_LANGINFO_H && defined HAVE_NL_LANGINFO
{
#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);
+ c
onst c
har *def = nl_langinfo(CODESET);
if (strcmp(def, "646") == 0) /* Solaris brain-damage */
return "ascii";
return def;
if (strcmp(def, "646") == 0) /* Solaris brain-damage */
return "ascii";
return def;
@@
-69,7
+69,7
@@
static char *default_charset(void)
void setup_iconv()
{
void setup_iconv()
{
- char *defset = default_charset();
+ c
onst c
har *defset = default_charset();
if (!am_server
&& (ic_chck = iconv_open(defset, defset)) == (iconv_t)-1) {
if (!am_server
&& (ic_chck = iconv_open(defset, defset)) == (iconv_t)-1) {