Enable compilation with clang

Some functions that ought to return a value call return without any value. This
commit adds a dummy value to each of those returns so that clang stops
complaining.
master
Robert Clausecker 2013-03-09 18:32:44 +07:00
parent 2b5f8dcd61
commit a00b1bdd48
4 changed files with 15 additions and 15 deletions

@ -741,13 +741,13 @@ XGCValues values;
hw->html.bgclip_SAVE=None; hw->html.bgclip_SAVE=None;
if (NoBodyImages(hw)) { if (NoBodyImages(hw)) {
return; return 0;
} }
/* ??? Why is this here? */ /* ??? Why is this here? */
hw->html.view->core.background_pixel = hw->html.background_SAVE ; hw->html.view->core.background_pixel = hw->html.background_SAVE ;
return; return 0;
} }
int NoBodyImages(Widget w) { int NoBodyImages(Widget w) {
@ -770,7 +770,7 @@ unsigned long valuemask;
XGCValues values; XGCValues values;
if (!bgname || !*bgname || !(hw->html.drawGC)) { if (!bgname || !*bgname || !(hw->html.drawGC)) {
return; return 0;
} }
if (hw->html.delay_images==True || currently_delaying_images==1) { if (hw->html.delay_images==True || currently_delaying_images==1) {
@ -814,7 +814,7 @@ XGCValues values;
} }
} }
return; return 0;
} }
@ -832,7 +832,7 @@ hw_do_color(Widget w, char *att, char *cname)
int i; int i;
if (!att || !*att || !cname || !*cname) { if (!att || !*att || !cname || !*cname) {
return; return -1;
} }
cmap = hw->core.colormap; cmap = hw->core.colormap;
@ -847,14 +847,14 @@ hw_do_color(Widget w, char *att, char *cname)
if(!allocated){ if(!allocated){
if(*val=='#') val++; if(*val=='#') val++;
if (!*val) { if (!*val) {
return; return -1;
} }
if (strlen(val)>=6) { if (strlen(val)>=6) {
/* Must be valid hex */ /* Must be valid hex */
for (i=0; i<6; i++) { for (i=0; i<6; i++) {
if (!strchr("0123456789AaBbCcDdEeFf",val[i])) { if (!strchr("0123456789AaBbCcDdEeFf",val[i])) {
return; return -1;
} }
} }
@ -875,10 +875,10 @@ hw_do_color(Widget w, char *att, char *cname)
col.flags = DoRed | DoGreen | DoBlue; col.flags = DoRed | DoGreen | DoBlue;
if (!XAllocColor(XtDisplay(w),cmap,&col)) { if (!XAllocColor(XtDisplay(w),cmap,&col)) {
return; return -1;
} }
} else { } else {
return; return -1;
} }
} }
@ -910,7 +910,7 @@ hw_do_color(Widget w, char *att, char *cname)
hw->html.activeAnchor_fg = col.pixel; hw->html.activeAnchor_fg = col.pixel;
} }
return; return -1;
} }
void void

@ -2706,7 +2706,7 @@ int extra;
if ((*mptr)->is_end) { if ((*mptr)->is_end) {
/* end of table */ /* end of table */
return; return 0;
} }
extra = 10; extra = 10;
@ -2715,7 +2715,7 @@ int extra;
SetElement(hw, E_TABLE, currentFont, *x, *y, (char *) mptr, NULL, NULL, IMAGE_DEFAULT_BORDER); SetElement(hw, E_TABLE, currentFont, *x, *y, (char *) mptr, NULL, NULL, IMAGE_DEFAULT_BORDER);
if (!Current->table_data) { if (!Current->table_data) {
/* no table */ /* no table */
return; return 0;
} }
Current->alignment = ALIGN_MIDDLE; Current->alignment = ALIGN_MIDDLE;
Current->width = Current->table_data->width; Current->width = Current->table_data->width;

@ -1078,11 +1078,11 @@ int baseLine;
int yy; int yy;
if (field->type == F_NONE) { /* nothing to display in field */ if (field->type == F_NONE) { /* nothing to display in field */
return; return -1;
} }
if (field->type != F_TEXT) { /* routine only does text at this time */ if (field->type != F_TEXT) { /* routine only does text at this time */
return; return -1;
} }
/* adjust for aesthetic surounding space */ /* adjust for aesthetic surounding space */

@ -960,7 +960,7 @@ int NNTPgetarthdrs(char *art,char **ref, char **grp, char **subj, char **from)
char ch = *p++ = HTGetCharacter (); char ch = *p++ = HTGetCharacter ();
if (ch==(char)EOF) { if (ch==(char)EOF) {
abort_socket(); /* End of file, close socket */ abort_socket(); /* End of file, close socket */
return; /* End of file on response */ return -1; /* End of file on response */
} }
if ((ch == LF) if ((ch == LF)