debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dtudcexch/dtudcfonted: Resolve 78 compiler warnings.

Browse Source
This commit is contained in:
Peter Howkins
2012-09-18 12:00:05 +01:00
parent e2432556b8
commit 5e14a88e2c
12 changed files with 69 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cde/programs/dtudcfonted/libfal/_fallcGeneric.c
View File

@@ -687,7 +687,7 @@ int num;
FontScope scope;
ret = (ExtdSegment)Xmalloc(sizeof(ExtdSegmentRec));
if(ret == NULL){
return (NULL);
return (0);
}
if(strchr(value[0],':')){
ret->name = (char *)Xmalloc(strlen(value[0])+1);
@@ -696,7 +696,7 @@ int num;
}
strcpy(ret->name,value[0]);
ptr = strchr(ret->name,':');
*ptr = NULL;
*ptr = 0;
ptr++;
if( !_fallcNCompareISOLatin1(ptr, "none", 4) ){
ret->side = XlcNONE ;
@@ -939,7 +939,7 @@ load_generic(lcd)
char tmp[128];
tmpb = (codeset->byteM)[M-1].byteinfo ;
/* default 0x00 - 0xff */
sscanf(value[ii],"\\x%lx,\\x%lx",&start,&end);
sscanf(value[ii], "\\x%lx,\\x%lx", (long unsigned *) &start, (long unsigned *) &end);
tmpb[ii].start = (unsigned char)start;
tmpb[ii].end = (unsigned char)end;
}

6
cde/programs/dtudcfonted/libfal/_fallcUTF.c
View File

@@ -172,7 +172,7 @@ long fb_default;
for(i = 0; i < NRUNE; i++)
table[i] = -1;
while((rv = fscanf(fptr, "%lx", &value)) != EOF) {
while((rv = fscanf(fptr, "%lx", (long unsigned *) &value)) != EOF) {
if(rv != 0 && value >= 0) {
table[value] = j++;
} else {
@@ -532,11 +532,11 @@ long fb_default;
register int i = 0;
int j = 0;
int rv = 0;
long value;
long value;
for(i = 0; i < NRUNE; i++)
from_tbl[i] = -1;
while((rv = fscanf(fptr, "%lx", &value)) != EOF) {
while((rv = fscanf(fptr, "%lx", (long unsigned *) &value)) != EOF) {
if(rv != 0) {
(*to_tbl)[j++] = value;
} else {

4
cde/programs/dtudcfonted/libfal/_falomGeneric.c
View File

@@ -608,7 +608,7 @@ static char
return NULL;
strcpy(pattern, font_name);
memset(fields, NULL, sizeof(char *) * 14);
memset(fields, 0, sizeof(char *) * 14);
ptr = pattern;
while(isspace(*ptr)) {
ptr++;
@@ -644,7 +644,7 @@ static char
strcpy(str_point, "*");
fields[POINT_SIZE_FIELD - 1] = str_point;
rotate_font[0] = NULL;
rotate_font[0] = '\0';
for(field_num = 0 ; field_num < CHARSET_ENCODING_FIELD &&
fields[field_num] ; field_num++) {
sprintf(rotate_font, "%s-%s", rotate_font, fields[field_num]);

16
cde/programs/dtudcfonted/libfal/falfont.c
View File

@@ -2369,7 +2369,7 @@ FalFontData *fdata;
if ((fp = open_fonts_list()) == NULL) {
return FAL_ERROR ;
}
memset( pname, NULL, sizeof( pname ) );
memset( pname, 0, sizeof( pname ) );
while ( fgets( buf, FAL_LINE_MAX, fp ) != ( char * ) NULL ) {
int eq;
@@ -2523,7 +2523,7 @@ FalFontData *fdata;
fls->list = p_bak ;
}
memset( buf, NULL, sizeof(buf));
memset( buf, 0, sizeof(buf));
while( fgets( buf, FAL_LINE_MAX, fp ) != (char *)NULL ) {
int tmp_num, eq ;
@@ -2535,7 +2535,7 @@ FalFontData *fdata;
/* parse string of font file */
if( (ep = strchr( buf, ' ' )) == (char *)NULL ) continue ;
else *ep = NULL ;
else *ep = 0 ;
/* refuse font file (not gpf) */
if(
( strcmp( FILE_SUFFIX(buf), PCFSUFFIX ) != 0 ) &&
@@ -2563,7 +2563,7 @@ FalFontData *fdata;
case _FAL_TRY_NEXT :
if( (func & SRCHFNAME) || (func & FONTOFID) ) FreeString( fontFileName ) ;
fal_clear_data( &tmp_data );
memset( buf, NULL, sizeof(buf));
memset( buf, 0, sizeof(buf));
continue ;
case 0:
if( (func & FONTOFID) ) FreeString( fontFileName ) ;
@@ -2577,7 +2577,7 @@ FalFontData *fdata;
if( !(func & FONTOFID) && (codeset_num == 0) ){
if( (func & SRCHFNAME) ) FreeString( fontFileName ) ;
fal_clear_data( &tmp_data );
memset( buf, NULL, sizeof(buf));
memset( buf, 0, sizeof(buf));
continue ;
}
@@ -2639,7 +2639,7 @@ FalFontData *fdata;
if( fal_read_fidinf( fid, &fontid_inf ) != FAL_ERROR )
fdata->cd_set = fontid_inf.cd_set ;
else {
fdata->cd_set = NULL ;
fdata->cd_set = 0 ;
goto FalError ;
}
fclose(fp) ;
@@ -3091,7 +3091,7 @@ unsigned int *glidx ;
/*
* get string of "CHARSET_REGISTRY"
*/
memset( &tmp_data, NULL, sizeof(FalFontData) ) ;
memset( &tmp_data, 0, sizeof(FalFontData) ) ;
if( cmpfid != fid ){
if( falReadGpfProp( FAL_READ_FONTINFO, finf, FAL_FONT_PRM, &tmp_data ) ) {
@@ -3158,7 +3158,7 @@ unsigned int *code ;
/*
* get string of "CHARSET_REGISTRY"
*/
memset( &tmp_data, NULL, sizeof(tmp_data) ) ;
memset( &tmp_data, 0, sizeof(tmp_data) ) ;
if( falReadGpfProp( FAL_READ_FONTINFO, finf, FAL_FONT_PRM, &tmp_data ) ) {
fal_clear_data( &tmp_data ) ;
return FAL_ERROR;

2
cde/programs/dtudcfonted/libfal/include/os.h
View File

@@ -98,7 +98,9 @@ pragma on(alloca);
#if defined(__GNUC__) || defined(__uxp__)
#if !defined(linux)
#define alloca ___builtin_alloca
#endif
#define ALLOCATE_LOCAL(size) alloca((int)(size))
#define DEALLOCATE_LOCAL(ptr) /* as nothing */
#else /* ! __GNUC__ ! __uxp__ */

8
cde/programs/dtudcfonted/libfal/syncx.c
View File

@@ -44,10 +44,10 @@ void _falmbDefaultDrawImageString() { return ; }
/* Atom */ falInternAtom() { return 0 ; }
int _falwcGenericDrawString() { return 0 ; }
char **_falParseBaseFontNameList() { return NULL ; }
/* XFontStruct * */ falLoadQueryFont() { return NULL ; }
/* XFontStruct * */ falLoadQueryFont() { return 0 ; }
falFreeFont() { return 0 ; }
falFreeFontInfo() { return 0 ; }
/* char ** */ falListFonts() { return NULL ; }
/* char ** */ falListFonts() { return 0 ; }
void _falmbGenericDrawImageString() { return ; }
void _falwcDefaultDrawImageString() { return ; }
int _falmbDefaultDrawString() { return 0 ; }
@@ -56,7 +56,7 @@ void falFreeStringList() { return ; }
/* falrmStringToQuark() { return 0 ; } */
/* falrmPermStringToQuark() { return 0 ; } */
int _falwcDefaultDrawString() { return 0 ; }
/* char * */ falGetAtomName() { return NULL ; }
/* char * */ falGetAtomName() { return 0 ; }
int _falwcGenericTextExtents() { return 0 ; }
int _falmbGenericTextExtents() { return 0 ; }
void _falwcGenericDrawImageString() { return ; }
@@ -67,7 +67,7 @@ int _falwcDefaultTextExtents() { return 0 ; }
int _falmbDefaultTextEscapement() { return 0 ; }
int _falwcGenericTextEscapement() { return 0 ; }
int _falmbDefaultTextExtents() { return 0 ; }
/* char ** */ falListFontsWithInfo() { return NULL ; }
/* char ** */ falListFontsWithInfo() { return 0 ; }
int _falwcDefaultTextEscapement() { return 0 ; }
/* Status */ _falwcGenericTextPerCharExtents(){ return 0 ; }
/* _fallcMapOSLocaleName() { return 0 ; } */