strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS warnings01 (1.5.18); FILE MERGED

Browse source 
2006/01/25 21:56:39 sb 1.5.18.2: RESYNC: (1.5-1.6); FILE MERGED
2005/10/24 15:59:25 is 1.5.18.1: #i56544# warning free code
This commit is contained in:
Jens-Heiner Rechtien 2006-06-20 02:35:33 +00:00
parent 1256077361
commit e4660e0770
1 changed files with 18 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
setup_native/source/ulfconv/ulfconv.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: ulfconv.cxx,v $
*
* $Revision: 1.6 $
* $Revision: 1.7 $
*
* last change: $Author: obo $ $Date: 2006-01-16 12:58:38 $
* last change: $Author: hr $ $Date: 2006-06-20 03:35:33 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -47,16 +47,16 @@
#include <map>
#include <string>
/*****************************************************************************/
/* typedefs
/*****************************************************************************/
/*****************************************************************************
* typedefs
*****************************************************************************/
typedef std::map< const std::string, rtl_TextEncoding > EncodingMap;
typedef struct {
const char *key;
const rtl_TextEncoding value;
} _pair;
struct _pair {
const char *key;
rtl_TextEncoding value;
};
static int _pair_compare (const char *key, const _pair *pair);
static const _pair* _pair_search (const char *key, const _pair *base, unsigned int member );
@ -81,9 +81,9 @@ const _pair _ms_encoding_list[] = {
};
/*****************************************************************************/
/* fgets that work with unix line ends on Windows
/*****************************************************************************/
/*****************************************************************************
* fgets that work with unix line ends on Windows
*****************************************************************************/
char * my_fgets(char *s, int n, FILE *fp)
{
@ -115,9 +115,9 @@ char * my_fgets(char *s, int n, FILE *fp)
}
}
/*****************************************************************************/
/* compare function for binary search
/*****************************************************************************/
/*****************************************************************************
* compare function for binary search
*****************************************************************************/
static int
_pair_compare (const char *key, const _pair *pair)
@ -126,9 +126,9 @@ _pair_compare (const char *key, const _pair *pair)
return result;
}
/*****************************************************************************/
/* binary search on encoding tables
/*****************************************************************************/
/*****************************************************************************
* binary search on encoding tables
*****************************************************************************/
static const _pair*
_pair_search (const char *key, const _pair *base, unsigned int member )
@ -166,8 +166,6 @@ _pair_search (const char *key, const _pair *base, unsigned int member )
void read_encoding_table(char * file, EncodingMap& aEncodingMap)
{
int nlang = 0;
FILE * fp = fopen(file, "r");
if ( ! fp ) {
fprintf(stderr, "ulfconv: %s %s\n", file, strerror(errno));