summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authortijl <tijl@FreeBSD.org>2015-04-30 16:08:47 +0000
committertijl <tijl@FreeBSD.org>2015-04-30 16:08:47 +0000
commitb709ec868adb5170d09bc5a66b18d0e0d5987ab6 (patch)
treec67e00b5fe571ffc8b53045db12739794a0aa566 /contrib
parentde0424ce2628044461b3970c30ea52cd23d4a937 (diff)
downloadFreeBSD-src-b709ec868adb5170d09bc5a66b18d0e0d5987ab6.zip
FreeBSD-src-b709ec868adb5170d09bc5a66b18d0e0d5987ab6.tar.gz
MFC r275805:
Fix incorrect type of "invalids" argument in __iconv() prototype. MFC r281550,281591: Remove the const qualifier from iconv(3) to comply with POSIX: http://pubs.opengroup.org/onlinepubs/9699919799/functions/iconv.html Adjust all code that calls iconv. PR: 199099
Diffstat (limited to 'contrib')
-rw-r--r--contrib/smbfs/include/netsmb/smb_lib.h14
-rw-r--r--contrib/smbfs/lib/smb/nls.c12
-rw-r--r--contrib/smbfs/lib/smb/print.c2
-rw-r--r--contrib/smbfs/lib/smb/rq.c4
4 files changed, 16 insertions, 16 deletions
diff --git a/contrib/smbfs/include/netsmb/smb_lib.h b/contrib/smbfs/include/netsmb/smb_lib.h
index 04e8279..12c7086 100644
--- a/contrib/smbfs/include/netsmb/smb_lib.h
+++ b/contrib/smbfs/include/netsmb/smb_lib.h
@@ -191,7 +191,7 @@ int smb_ctx_readrc(struct smb_ctx *);
int smb_ctx_resolve(struct smb_ctx *);
int smb_ctx_setflags(struct smb_ctx *, int, int, int);
-int smb_smb_open_print_file(struct smb_ctx *, int, int, const char *, smbfh*);
+int smb_smb_open_print_file(struct smb_ctx *, int, int, char *, smbfh*);
int smb_smb_close_print_file(struct smb_ctx *, smbfh);
int smb_read(struct smb_ctx *, smbfh, off_t, size_t, char *);
@@ -204,8 +204,8 @@ int smb_rq_init(struct smb_ctx *, u_char, size_t, struct smb_rq **);
void smb_rq_done(struct smb_rq *);
void smb_rq_wend(struct smb_rq *);
int smb_rq_simple(struct smb_rq *);
-int smb_rq_dmem(struct mbdata *, const char *, size_t);
-int smb_rq_dstring(struct mbdata *, const char *);
+int smb_rq_dmem(struct mbdata *, char *, size_t);
+int smb_rq_dstring(struct mbdata *, char *);
int smb_t2_request(struct smb_ctx *, int, int, const char *,
int, void *, int, void *, int *, void *, int *, void *);
@@ -246,10 +246,10 @@ extern u_char nls_lower[256], nls_upper[256];
int nls_setrecode(const char *, const char *);
int nls_setlocale(const char *);
-char* nls_str_toext(char *, const char *);
-char* nls_str_toloc(char *, const char *);
-void* nls_mem_toext(void *, const void *, int);
-void* nls_mem_toloc(void *, const void *, int);
+char* nls_str_toext(char *, char *);
+char* nls_str_toloc(char *, char *);
+void* nls_mem_toext(void *, void *, int);
+void* nls_mem_toloc(void *, void *, int);
char* nls_str_upper(char *, const char *);
char* nls_str_lower(char *, const char *);
diff --git a/contrib/smbfs/lib/smb/nls.c b/contrib/smbfs/lib/smb/nls.c
index 5c2dbd9..b79d49c 100644
--- a/contrib/smbfs/lib/smb/nls.c
+++ b/contrib/smbfs/lib/smb/nls.c
@@ -102,7 +102,7 @@ nls_setrecode(const char *local, const char *external)
}
char *
-nls_str_toloc(char *dst, const char *src)
+nls_str_toloc(char *dst, char *src)
{
#ifdef HAVE_ICONV
char *p = dst;
@@ -125,7 +125,7 @@ nls_str_toloc(char *dst, const char *src)
}
char *
-nls_str_toext(char *dst, const char *src)
+nls_str_toext(char *dst, char *src)
{
#ifdef HAVE_ICONV
char *p = dst;
@@ -148,11 +148,11 @@ nls_str_toext(char *dst, const char *src)
}
void *
-nls_mem_toloc(void *dst, const void *src, int size)
+nls_mem_toloc(void *dst, void *src, int size)
{
#ifdef HAVE_ICONV
char *p = dst;
- const char *s = src;
+ char *s = src;
size_t inlen, outlen;
if (size == 0)
@@ -174,11 +174,11 @@ nls_mem_toloc(void *dst, const void *src, int size)
}
void *
-nls_mem_toext(void *dst, const void *src, int size)
+nls_mem_toext(void *dst, void *src, int size)
{
#ifdef HAVE_ICONV
char *p = dst;
- const char *s = src;
+ char *s = src;
size_t inlen, outlen;
if (size == 0)
diff --git a/contrib/smbfs/lib/smb/print.c b/contrib/smbfs/lib/smb/print.c
index 243ad5b..b4c07c6 100644
--- a/contrib/smbfs/lib/smb/print.c
+++ b/contrib/smbfs/lib/smb/print.c
@@ -54,7 +54,7 @@
int
smb_smb_open_print_file(struct smb_ctx *ctx, int setuplen, int mode,
- const char *ident, smbfh *fhp)
+ char *ident, smbfh *fhp)
{
struct smb_rq *rqp;
struct mbdata *mbp;
diff --git a/contrib/smbfs/lib/smb/rq.c b/contrib/smbfs/lib/smb/rq.c
index 7ecbb36..7dda4792 100644
--- a/contrib/smbfs/lib/smb/rq.c
+++ b/contrib/smbfs/lib/smb/rq.c
@@ -86,7 +86,7 @@ smb_rq_wend(struct smb_rq *rqp)
}
int
-smb_rq_dmem(struct mbdata *mbp, const char *src, size_t size)
+smb_rq_dmem(struct mbdata *mbp, char *src, size_t size)
{
struct mbuf *m;
char * dst;
@@ -118,7 +118,7 @@ smb_rq_dmem(struct mbdata *mbp, const char *src, size_t size)
}
int
-smb_rq_dstring(struct mbdata *mbp, const char *s)
+smb_rq_dstring(struct mbdata *mbp, char *s)
{
return smb_rq_dmem(mbp, s, strlen(s) + 1);
}
OpenPOWER on IntegriCloud