philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change BX_add_to_screen() and BX_skip_incoming_mirc() to use char * rather than unsigned char * arguments.

Browse Source 
This clears up a few pointer type mismatch warnings.


git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@477 13b04d17-f746-0410-82c6-800466cd88b0
This commit is contained in:
Kevin Easton
2013-11-18 12:38:07 +00:00
parent ced7f9bcc9
commit f22dc54b13
3 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/modval.h
View File

@@ -251,7 +251,6 @@ extern Function_ptr *global;
#define put_it (*(void (*)(const char *, ...))global[PUT_IT])
#define bitchsay (*(void (*)(const char *, ...))global[BITCHSAY])
#define yell (*(void (*)(const char *, ...))global[YELL])
#define add_to_screen (*(void (*)(unsigned char *))global[ADD_TO_SCREEN])
#define add_to_log (*(void (*)(FILE *, time_t, const char *, int ))global[ADD_TO_LOG])
#define bsd_glob (*(int (*)(const char *, int, int (*)(const char *, int), glob_t *))global[BSD_GLOB])
@@ -278,8 +277,8 @@ extern Function_ptr *global;
/* screen.c */
#define prepare_display (*(unsigned char **(*)(const unsigned char *, int , int *, int ))global[PREPARE_DISPLAY])
#define add_to_window (*(void (*)(Window *, const unsigned char *))global[ADD_TO_WINDOW])
#define skip_incoming_mirc (*(unsigned char *(*)(unsigned char *))global[SKIP_INCOMING_MIRC])
#define add_to_screen (*(void (*)(unsigned char *))global[ADD_TO_SCREEN])
#define skip_incoming_mirc (*(char *(*)(char *))global[SKIP_INCOMING_MIRC])
#define add_to_screen (*(void (*)(char *))global[ADD_TO_SCREEN])
#define split_up_line (*(unsigned char **(*)(const unsigned char *, int ))global[SPLIT_UP_LINE])
#define output_line (*(int (*)(const unsigned char *))global[OUTPUT_LINE])
#define output_with_count (*(int (*)(const unsigned char *, int , int ))global[OUTPUT_WITH_COUNT])

5
include/screen.h
View File

@@ -48,7 +48,7 @@ RETSIGTYPE sig_refresh_screen (int);
ShrinkInfo resize_display (Window *);
void redraw_window (Window *, int);
void redraw_all_windows (void);
void BX_add_to_screen (unsigned char *);
void BX_add_to_screen (char *);
void do_screens (fd_set *);
unsigned char **BX_split_up_line(const unsigned char *, int);
void BX_xterm_settitle(void);
@@ -65,8 +65,7 @@ Screen * BX_create_new_screen(void);
const u_char *BX_skip_ctl_c_seq (const u_char *, int *, int *, int);
u_char **BX_prepare_display (const u_char *, int, int *, int);
int BX_output_with_count (const unsigned char *, int, int);
unsigned char *BX_skip_incoming_mirc (unsigned char *);
void delchar(unsigned char **text, int cnum);
char *BX_skip_incoming_mirc (char *);
/* Dont do any word-wrapping, just truncate each line at its place. */
#define PREPARE_NOWRAP 0x01