summaryrefslogtreecommitdiffstats
path: root/libvncserver/font.c
diff options
context:
space:
mode:
authordscho <dscho>2005-05-15 13:57:51 +0000
committerdscho <dscho>2005-05-15 13:57:51 +0000
commit8bee4eb990273c3654431467ba6618eb916f030a (patch)
treef3077e1cb12a4cb778047814583fc0b2f26bb7b2 /libvncserver/font.c
parentbe5b1296e4aa4d8a51cd709853408ec0cd7b768b (diff)
downloadlibvncserver-8bee4eb990273c3654431467ba6618eb916f030a.zip
libvncserver-8bee4eb990273c3654431467ba6618eb916f030a.tar.gz
ANSIfy, fix some warnings from Linus' sparse
Diffstat (limited to 'libvncserver/font.c')
-rwxr-xr-xlibvncserver/font.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libvncserver/font.c b/libvncserver/font.c
index 18c1bbb..267d8a2 100755
--- a/libvncserver/font.c
+++ b/libvncserver/font.c
@@ -145,7 +145,7 @@ void rfbWholeFontBBox(rfbFontDataPtr font,
int i;
int* m=font->metaData;
- (*x1)=(*y1)=INT_MAX; (*x2)=(*y2)=-INT_MAX+1;
+ (*x1)=(*y1)=INT_MAX; (*x2)=(*y2)=1-(INT_MAX);
for(i=0;i<256;i++) {
if(m[i*5+1]-m[i*5+3]>(*x2))
(*x2)=m[i*5+1]-m[i*5+3];
@@ -164,14 +164,14 @@ rfbFontDataPtr rfbLoadConsoleFont(char *filename)
rfbFontDataPtr p;
int i;
- if(!f) return(0);
+ if(!f) return NULL;
p=(rfbFontDataPtr)malloc(sizeof(rfbFontData));
p->data=(unsigned char*)malloc(4096);
if(1!=fread(p->data,4096,1,f)) {
free(p->data);
free(p);
- return(0);
+ return NULL;
}
fclose(f);
p->metaData=(int*)malloc(256*5*sizeof(int));
OpenPOWER on IntegriCloud