Skip to content

Commit

Permalink
- more '-Wall -pedantic' warnings resolved
Browse files Browse the repository at this point in the history
  • Loading branch information
dk committed Oct 26, 2002
1 parent 53e1bca commit e8ac9c6
Show file tree
Hide file tree
Showing 23 changed files with 113 additions and 111 deletions.
40 changes: 20 additions & 20 deletions AbstractMenu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ AbstractMenu_get_items ( Handle self, char * varName)
if ( var-> stage > csFrozen) return nilSV;
if ( strlen( varName))
{
PMenuItemReg m = ( PMenuItemReg) my-> first_that( self, var_match, varName, true);
PMenuItemReg m = ( PMenuItemReg) my-> first_that( self, (void*)var_match, varName, true);
return ( m && m-> down) ? new_av( m-> down, 1) : nilSV;
} else return var-> tree ? new_av( var-> tree, 0) : nilSV;
}
Expand Down Expand Up @@ -549,7 +549,7 @@ AbstractMenu_first_that( Handle self, void * actionProc, void * params, Bool use
Bool
AbstractMenu_has_item( Handle self, char * varName)
{
return my-> first_that( self, var_match, varName, true) != nil;
return my-> first_that( self, (void*)var_match, varName, true) != nil;
}


Expand All @@ -558,7 +558,7 @@ AbstractMenu_accel( Handle self, Bool set, char * varName, char * accel)
{
PMenuItemReg m;
if ( var-> stage > csFrozen) return "";
m = ( PMenuItemReg) my-> first_that( self, var_match, varName, true);
m = ( PMenuItemReg) my-> first_that( self, (void*)var_match, varName, true);
if ( !m) return "";
if ( !set)
return m-> accel ? m-> accel : "";
Expand All @@ -577,7 +577,7 @@ AbstractMenu_action( Handle self, Bool set, char * varName, SV * action)
{
PMenuItemReg m;
if ( var-> stage > csFrozen) return nilSV;
m = ( PMenuItemReg) my-> first_that( self, var_match, varName, true);
m = ( PMenuItemReg) my-> first_that( self, (void*)var_match, varName, true);
if ( !m) return nilSV;
if ( !set) {
if ( m-> code) return newSVsv( m-> code);
Expand Down Expand Up @@ -611,7 +611,7 @@ AbstractMenu_checked( Handle self, Bool set, char * varName, Bool checked)
{
PMenuItemReg m;
if ( var-> stage > csFrozen) return false;
m = ( PMenuItemReg) my-> first_that( self, var_match, varName, true);
m = ( PMenuItemReg) my-> first_that( self, (void*)var_match, varName, true);
if ( m == nil) return false;
if ( !set)
return m ? m-> checked : false;
Expand All @@ -628,7 +628,7 @@ AbstractMenu_data ( Handle self, Bool set, char * varName, SV * data)
{
PMenuItemReg m;
if ( var-> stage > csFrozen) return nilSV;
m = ( PMenuItemReg) my-> first_that( self, var_match, varName, true);
m = ( PMenuItemReg) my-> first_that( self, (void*)var_match, varName, true);
if ( m == nil) return nilSV;
if ( !set)
return m-> data ? newSVsv( m-> data) : nilSV;
Expand All @@ -642,7 +642,7 @@ AbstractMenu_enabled( Handle self, Bool set, char * varName, Bool enabled)
{
PMenuItemReg m;
if ( var-> stage > csFrozen) return false;
m = ( PMenuItemReg) my-> first_that( self, var_match, varName, true);
m = ( PMenuItemReg) my-> first_that( self, (void*)var_match, varName, true);
if ( m == nil) return false;
if ( !set)
return m ? !m-> disabled : false;
Expand All @@ -662,7 +662,7 @@ AbstractMenu_image( Handle self, Bool set, char * varName, Handle image)

if ( var-> stage > csFrozen) return nilHandle;

m = ( PMenuItemReg) my-> first_that( self, var_match, varName, true);
m = ( PMenuItemReg) my-> first_that( self, (void*)var_match, varName, true);
if ( m == nil) return nilHandle;
if ( !m-> bitmap) return nilHandle;
if ( !set) {
Expand Down Expand Up @@ -696,7 +696,7 @@ AbstractMenu_text ( Handle self, Bool set, char * varName, char * text)
{
PMenuItemReg m;
if ( var-> stage > csFrozen) return "";
m = ( PMenuItemReg) my-> first_that( self, var_match, varName, true);
m = ( PMenuItemReg) my-> first_that( self, (void*)var_match, varName, true);
if ( m == nil) return "";
if ( m-> text == nil) return "";
if ( !set)
Expand All @@ -715,7 +715,7 @@ AbstractMenu_key( Handle self, Bool set, char * varName, SV * key)
{
PMenuItemReg m;
if ( var-> stage > csFrozen) return nilSV;
m = ( PMenuItemReg) my-> first_that( self, var_match, varName, true);
m = ( PMenuItemReg) my-> first_that( self, (void*)var_match, varName, true);
if ( m == nil) return nilSV;
if ( m-> divider || m-> down) return nilSV;
if ( !set)
Expand All @@ -733,7 +733,7 @@ AbstractMenu_set_variable( Handle self, char * varName, char * newName)
{
PMenuItemReg m;
if ( var-> stage > csFrozen) return;
m = ( PMenuItemReg) my-> first_that( self, var_match, varName, true);
m = ( PMenuItemReg) my-> first_that( self, (void*)var_match, varName, true);
if ( m == nil) return;
free( m-> variable);
m-> variable = duplicate_string( newName);
Expand All @@ -751,7 +751,7 @@ AbstractMenu_sub_call( Handle self, PMenuItemReg m)
Bool
AbstractMenu_sub_call_id ( Handle self, int sysId)
{
return my-> sub_call( self, ( PMenuItemReg) my-> first_that( self, id_match, &sysId, false));
return my-> sub_call( self, ( PMenuItemReg) my-> first_that( self, (void*)id_match, &sysId, false));
}

#define keyRealize( key) if ((( key & 0xFF) >= 'A') && (( key & 0xFF) <= 'z')) \
Expand All @@ -764,7 +764,7 @@ Bool
AbstractMenu_sub_call_key ( Handle self, int key)
{
keyRealize( key);
return my-> sub_call( self, ( PMenuItemReg) my-> first_that( self, key_match, &key, false));
return my-> sub_call( self, ( PMenuItemReg) my-> first_that( self, (void*)key_match, &key, false));
}

typedef struct _Kmcc
Expand Down Expand Up @@ -793,7 +793,7 @@ AbstractMenu_set_command( Handle self, char * key, Bool enabled)
mcc. key = key_normalize( key);
mcc. enabled = enabled;
if ( var-> stage > csFrozen) return;
my-> first_that( self, kmcc, &mcc, true);
my-> first_that( self, (void*)kmcc, &mcc, true);
}

Bool AbstractMenu_selected( Handle self, Bool set, Bool selected)
Expand Down Expand Up @@ -852,12 +852,12 @@ AbstractMenu_remove( Handle self, char * varName)
{
PMenuItemReg up, prev, m;
if ( var-> stage > csFrozen) return;
m = ( PMenuItemReg) my-> first_that( self, var_match, varName, true);
m = ( PMenuItemReg) my-> first_that( self, (void*)var_match, varName, true);
if ( m == nil) return;
if ( var-> stage <= csNormal && var-> system)
apc_menu_item_delete( self, m);
up = ( PMenuItemReg) my-> first_that( self, up_match, m, true);
prev = ( PMenuItemReg) my-> first_that( self, prev_match, m, true);
up = ( PMenuItemReg) my-> first_that( self, (void*)up_match, m, true);
prev = ( PMenuItemReg) my-> first_that( self, (void*)prev_match, m, true);
if ( up) up -> down = m-> next;
if ( prev) prev-> next = m-> next;
if ( m == var-> tree) var-> tree = m-> next;
Expand Down Expand Up @@ -900,7 +900,7 @@ AbstractMenu_insert( Handle self, SV * menuItems, char * rootName, int index)
up = &var-> tree;
level = 0;
} else {
branch = m = ( PMenuItemReg) my-> first_that( self, var_match, rootName, true);
branch = m = ( PMenuItemReg) my-> first_that( self, (void*)var_match, rootName, true);
if ( m == nil || m-> down == nil) return;
up = &m-> down;
m = m-> down;
Expand All @@ -910,13 +910,13 @@ AbstractMenu_insert( Handle self, SV * menuItems, char * rootName, int index)
{
int maxId = 0;
PMenuItemReg save = var-> tree;
my-> first_that( self, collect_id, &maxId, true);
my-> first_that( self, (void*)collect_id, &maxId, true);
autoEnum = maxId;
/* the level is 0 or 1 for the sake of rightAdjust */
addFirst = ( PMenuItemReg) my-> new_menu( self, menuItems, level, &subCount, &autoEnum);
if ( !addFirst) return; /* error in menuItems */
var-> tree = addFirst;
my-> first_that( self, increase_id, &maxId, true);
my-> first_that( self, (void*)increase_id, &maxId, true);
var-> tree = save;
}

Expand Down
10 changes: 5 additions & 5 deletions Application.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,12 +152,12 @@ Application_done( Handle self)
void
Application_cleanup( Handle self)
{
my-> first_that( self, kill_all, nil);
my-> first_that( self, (void*)kill_all, nil);
if ( var-> icon)
my-> detach( self, var-> icon, true);
var-> icon = nilHandle;

my-> first_that_component( self, kill_all, nil);
my-> first_that_component( self, (void*)kill_all, nil);

CDrawable-> cleanup( self);
}
Expand Down Expand Up @@ -495,7 +495,7 @@ Application_icon( Handle self, Bool set, Handle icon)
icon = ((( PImage) icon)-> self)-> dup( icon);
++SvREFCNT( SvRV((( PAnyObject) icon)-> mate));
}
my-> first_that( self, icon_notify, (void*)icon);
my-> first_that( self, (void*)icon_notify, (void*)icon);
if ( var-> icon)
my-> detach( self, var-> icon, true);
var-> icon = icon;
Expand Down Expand Up @@ -560,7 +560,7 @@ Application_colorIndex( Handle self, Bool set, int index, Color color)
SingleColor s;
s. color = color;
s. index = index;
if ( !opt_InPaint) my-> first_that( self, single_color_notify, &s);
if ( !opt_InPaint) my-> first_that( self, (void*)single_color_notify, &s);
if ( opt_InPaint) switch ( index) {
case ciFore:
CDrawable-> set_color ( self, color);
Expand All @@ -577,7 +577,7 @@ Application_colorIndex( Handle self, Bool set, int index, Color color)
void
Application_set_font( Handle self, Font font)
{
if ( !opt_InPaint) my-> first_that( self, font_notify, &font);
if ( !opt_InPaint) my-> first_that( self, (void*)font_notify, &font);
apc_font_pick( self, &font, & var-> font);
if ( opt_InPaint) apc_gp_set_font ( self, &var-> font);
}
Expand Down
16 changes: 8 additions & 8 deletions Clipboard.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ Clipboard_init( Handle self, HV * profile)
if ( !apc_clipboard_create(self))
croak( "RTC0022: Cannot create clipboard");
if (clipboards == 0) {
Clipboard_register_format_proc( self, "Text", text_server);
Clipboard_register_format_proc( self, "Image", image_server);
Clipboard_register_format_proc( self, "Text", (void*)text_server);
Clipboard_register_format_proc( self, "Image", (void*)image_server);
}
clipboards++;
}
Expand Down Expand Up @@ -123,7 +123,7 @@ find_format( Handle self, PClipboardFormatReg item, char *format)
void *
Clipboard_register_format_proc( Handle self, char * format, void * serverProc)
{
PClipboardFormatReg list = first_that( self, find_format, format);
PClipboardFormatReg list = first_that( self, (void*)find_format, format);
if ( list) {
my-> deregister_format( self, format);
}
Expand All @@ -144,7 +144,7 @@ Clipboard_register_format_proc( Handle self, char * format, void * serverProc)
void
Clipboard_deregister_format( Handle self, char * format)
{
PClipboardFormatReg fr = first_that( self, find_format, format);
PClipboardFormatReg fr = first_that( self, (void*)find_format, format);
PClipboardFormatReg list = formats;
if ( fr == nil) return;
fr-> server( self, fr, cefDone, nilSV);
Expand Down Expand Up @@ -183,7 +183,7 @@ Bool
Clipboard_format_exists( Handle self, char * format)
{
Bool ret;
PClipboardFormatReg fr = first_that( self, find_format, format);
PClipboardFormatReg fr = first_that( self, (void*)find_format, format);
if ( !fr) return false;
my-> open( self);
ret = apc_clipboard_has_format( self, fr-> sysId);
Expand All @@ -195,7 +195,7 @@ SV *
Clipboard_fetch( Handle self, char * format)
{
SV * ret;
PClipboardFormatReg fr = first_that( self, find_format, format);
PClipboardFormatReg fr = first_that( self, (void*)find_format, format);
my-> open( self);
if ( !fr || !my-> format_exists( self, format))
ret = newSVsv( nilSV);
Expand All @@ -208,7 +208,7 @@ Clipboard_fetch( Handle self, char * format)
void
Clipboard_store( Handle self, char * format, SV * data)
{
PClipboardFormatReg fr = first_that( self, find_format, format);
PClipboardFormatReg fr = first_that( self, (void*)find_format, format);

if ( !fr) return;
my-> open( self);
Expand Down Expand Up @@ -242,7 +242,7 @@ Clipboard_register_format( Handle self, char * format)
( strcmp( format, "Text") == 0) ||
( strcmp( format, "Image") == 0))
return false;
proc = Clipboard_register_format_proc( self, format, binary_server);
proc = Clipboard_register_format_proc( self, format, (void*)binary_server);
return proc != nil;
}

Expand Down
14 changes: 7 additions & 7 deletions Component.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ static Bool bring_by_name( Handle self, PComponent item, char * name)
Handle
Component_bring( Handle self, char * componentName)
{
return my-> first_that_component( self, bring_by_name, componentName);
return my-> first_that_component( self, (void*)bring_by_name, componentName);
}

static Bool
Expand All @@ -106,7 +106,7 @@ Component_cleanup( Handle self)
Event ev = {cmDestroy};

if ( var-> components != nil)
list_first_that( var-> components, detach_all, ( void*) self);
list_first_that( var-> components, (void*)detach_all, ( void*) self);

ev. gen. source = self;
my-> message( self, &ev);
Expand Down Expand Up @@ -161,20 +161,20 @@ Component_done( Handle self)

if ( var-> refs) {
Handle * pself = &self;
list_first_that( var-> refs, free_eventref, pself);
list_first_that( var-> refs, (void*)free_eventref, pself);
plist_destroy( var-> refs);
var-> refs = nil;
}

if ( var-> postList != nil) {
list_first_that( var-> postList, free_private_posts, nil);
list_first_that( var-> postList, (void*)free_private_posts, nil);
list_destroy( var-> postList);
free( var-> postList);
var-> postList = nil;
}
if ( var-> evQueue != nil)
{
list_first_that( var-> evQueue, free_queue, nil);
list_first_that( var-> evQueue, (void*)free_queue, nil);
list_destroy( var-> evQueue);
free( var-> evQueue);
var-> evQueue = nil;
Expand Down Expand Up @@ -309,7 +309,7 @@ Component_message( Handle self, PEvent event)
goto ForceProcess;
case ctSingle:
event-> cmd = ( event-> cmd & ~ctQueueMask) | ctSingleResponse;
if ( list_first_that( var-> evQueue, find_dup_msg, &event-> cmd) >= 0)
if ( list_first_that( var-> evQueue, (void*)find_dup_msg, &event-> cmd) >= 0)
break;
default:
{
Expand Down Expand Up @@ -412,7 +412,7 @@ Component_handle_event( Handle self, PEvent event)
PList q = var-> evQueue;
var-> evQueue = nil;
if ( q-> count > 0)
list_first_that( q, oversend, ( void*) self);
list_first_that( q, (void*)oversend, ( void*) self);
list_destroy( q);
free( q);
}
Expand Down
Loading

0 comments on commit e8ac9c6

Please sign in to comment.