tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added test for iconv parm 2 constness

Browse Source
This commit is contained in:
dockes
2007-06-19 07:52:33 +00:00
parent 18b3573358
commit c4b099e8d3
5 changed files with 249 additions and 545 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/utils/transcode.cpp
+6 -5
View File
@@ -1,5 +1,5 @@
#ifndef lint
static char rcsid[] = "@(#$Id: transcode.cpp,v 1.10 2007-05-30 12:31:19 dockes Exp $ (C) 2004 J.F.Dockes";
static char rcsid[] = "@(#$Id: transcode.cpp,v 1.11 2007-06-19 07:52:33 dockes Exp $ (C) 2004 J.F.Dockes";
#endif
/*
* This program is free software; you can redistribute it and/or modify
@@ -32,11 +32,12 @@ using std::string;
#include "transcode.h"
#include "debuglog.h"
#include "autoconfig.h"
#if !defined(_LIBICONV_VERSION)
#define CHARPP (char **)
#ifdef RCL_ICONV_INBUF_CONST
#define ICV_P2_TYPE const char**
#else
#define CHARPP
#define ICV_P2_TYPE char**
#endif
bool transcode(const string &in, string &out, const string &icode,
@@ -66,7 +67,7 @@ bool transcode(const string &in, string &out, const string &icode,
osiz = OBSIZ;
int isiz0=isiz;
if(iconv(ic, CHARPP&ip, &isiz, &op, &osiz) == (size_t)-1 &&
if(iconv(ic, (ICV_P2_TYPE)&ip, &isiz, &op, &osiz) == (size_t)-1 &&
errno != E2BIG) {
#if 0
out.erase();