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

Convert skip_ctl_c_seq() and its callers (except strip_ansi()) from unsigned char to char

Browse Source 
This should make no functional difference, and cuts out a large number of
unsigned char * / char * mismatch warnings.
This commit is contained in:
Kevin Easton
2015-06-17 22:50:49 +10:00
parent 563493dd6a
commit d0b0a95330
10 changed files with 83 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/ircaux.h
View File

@@ -126,7 +126,7 @@ char * BX_strpcat (char *, const char *, ...);
char * BX_strmpcat (char *, size_t, const char *, ...);
char * chomp (char *);
size_t BX_ccspan (const char *, int);
u_char *BX_strcpy_nocolorcodes (u_char *, const u_char *);
char *BX_strcpy_nocolorcodes(char *, const char *);
unsigned long randm(unsigned long);
unsigned long randt(unsigned long);
unsigned long randd(unsigned long);

14
include/modval.h
View File

@@ -189,7 +189,7 @@ extern Function_ptr *global;
#define ccscpan (*(size_t (*)(const char *, int))global[CCSPAN])
#define charcount (*(int (*)(const char *, char ))global[CHARCOUNT])
#define strpcat (*(char *(*)(char *, const char *, ...))global[STRPCAT])
#define strcpy_nocolorcodes (*(u_char *(*)(u_char *, const u_char *))global[STRCPY_NOCOLORCODES])
#define strcpy_nocolorcodes (*(char *(*)(char *, const char *))global[STRCPY_NOCOLORCODES])
#define cryptit (*(char *(*)(const char *))global[CRYPTIT])
#define stripdev (*(char *(*)(char *))global[STRIPDEV])
#define mangle_line (*(size_t (*)(char *, int, size_t))global[MANGLE_LINE])
@@ -275,13 +275,13 @@ extern Function_ptr *global;
#define dcc_printf (*(int (*)(int, char *, ...))global[DCC_PRINTF])
/* 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 prepare_display (*(char **(*)(const char *, int , int *, int ))global[PREPARE_DISPLAY])
#define add_to_window (*(void (*)(Window *, const char *))global[ADD_TO_WINDOW])
#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])
#define split_up_line (*(char **(*)(const char *, int ))global[SPLIT_UP_LINE])
#define output_line (*(int (*)(const char *))global[OUTPUT_LINE])
#define output_with_count (*(int (*)(const char *, int , int ))global[OUTPUT_WITH_COUNT])
#define scroll_window (*(void (*)(Window *))global[SCROLL_WINDOW])
/* Previous broken definitions - yet it still seemed to work?
#define cursor_not_in_display(x) ((void) (global[CURSOR_IN_DISPLAY]((Screen *)x)))
@@ -295,7 +295,7 @@ extern Function_ptr *global;
#define kill_screen (*(void (*)(Screen *))global[KILL_SCREEN])
#define xterm_settitle (*(void (*)(void))global[XTERM_SETTITLE])
#define add_wait_prompt (*(void (*)(char *, void (*)(char *, char *), char *, int , int ))global[ADD_WAIT_PROMPT])
#define skip_ctl_c_seq (*(const unsigned char *(*)(const unsigned char *, int *, int *, int ))global[SKIP_CTL_C_SEQ])
#define skip_ctl_c_seq (*(char *(*)(const char *, int *, int *, int ))global[SKIP_CTL_C_SEQ])
#define strip_ansi (*(unsigned char *(*)(const unsigned char *))global[STRIP_ANSI])
#define create_new_screen ((Screen * (*)(void))global[CREATE_NEW_SCREEN])
#define create_additional_screen ((Window * (*)(void))global[CREATE_ADDITIONAL_SCREEN])

13
include/screen.h
View File

@@ -29,7 +29,7 @@
#define curr_scr_win current_screen->current_window
void clear_window (Window *);
int BX_output_line (const unsigned char *);
int BX_output_line (const char *);
Window *BX_create_additional_screen (void);
void BX_scroll_window (Window *);
void update_all_windows (void);
@@ -44,15 +44,14 @@
RETSIGTYPE sig_refresh_screen (int);
int check_screen_redirect (char *);
void BX_kill_screen (Screen *);
int rite (Window *, const unsigned char *);
ShrinkInfo resize_display (Window *);
void redraw_window (Window *, int);
void redraw_all_windows (void);
void BX_add_to_screen (char *);
void do_screens (fd_set *);
unsigned char **BX_split_up_line(const unsigned char *, int);
char **BX_split_up_line(const char *, int);
void BX_xterm_settitle(void);
void BX_add_to_window(Window *, const unsigned char *);
void BX_add_to_window(Window *, const char *);
Screen * BX_create_new_screen(void);
@@ -62,9 +61,9 @@ Screen * BX_create_new_screen(void);
u_char *BX_strip_ansi (const u_char *);
char *normalize_color (int, int, int, int);
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);
char *BX_skip_ctl_c_seq(const char *, int *, int *, int);
char **BX_prepare_display(const char *, int, int *, int);
int BX_output_with_count(const char *, int, int);
char *BX_skip_incoming_mirc (char *);
/* Dont do any word-wrapping, just truncate each line at its place. */

2
include/struct.h
View File

@@ -697,7 +697,7 @@ typedef struct WindowStru
int window_display; /* should we display to this window */
void (*output_func) (struct WindowStru *, const unsigned char *);
void (*output_func) (struct WindowStru *, const char *);
void (*status_output_func) (struct WindowStru *);
struct ScreenStru *screen;