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

Clean up unsigned char / char mismatches in screen.c

Browse Source 
Also remove a couple of unused variables in prepare_display()
and create_additional_screen().
This commit is contained in:
Kevin Easton
2015-06-21 22:50:44 +10:00
parent 91d6169cb7
commit 90f85dec0c
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/screen.c
View File

@@ -364,7 +364,6 @@ char **BX_prepare_display(const char *orig_str,
int *lused, int *lused,
int flags) int flags)
{ {
int gchar_mode;
static int recursion = 0, static int recursion = 0,
output_size = 0; output_size = 0;
int pos = 0, /* Current position in "buffer" */ int pos = 0, /* Current position in "buffer" */
@@ -396,7 +395,6 @@ char **BX_prepare_display(const char *orig_str,
ircpanic("prepare_display() called recursively"); ircpanic("prepare_display() called recursively");
recursion++; recursion++;
gchar_mode = get_int_var(DISPLAY_PC_CHARACTERS_VAR);
beep_max = get_int_var(BEEP_VAR)? get_int_var(BEEP_MAX_VAR) : -1; beep_max = get_int_var(BEEP_VAR)? get_int_var(BEEP_MAX_VAR) : -1;
tab_max = get_int_var(TAB_VAR) ? get_int_var(TAB_MAX_VAR) : -1; tab_max = get_int_var(TAB_VAR) ? get_int_var(TAB_MAX_VAR) : -1;
nds_max = get_int_var(ND_SPACE_MAX_VAR); nds_max = get_int_var(ND_SPACE_MAX_VAR);
@@ -1548,7 +1546,7 @@ Screen * BX_create_new_screen(void)
extern Window *BX_create_additional_screen (void) extern Window *BX_create_additional_screen (void)
{ {
Window *win; Window *win;
Screen *oldscreen, *new; Screen *new;
char *displayvar, char *displayvar,
*termvar; *termvar;
int screen_type = ST_NOTHING; int screen_type = ST_NOTHING;
@@ -1603,7 +1601,6 @@ extern Window *BX_create_additional_screen (void)
return NULL; return NULL;
} }
oldscreen = current_window->screen;
new = create_new_screen(); new = create_new_screen();
switch ((child = fork())) switch ((child = fork()))
@@ -1750,10 +1747,8 @@ extern Window *BX_create_additional_screen (void)
extern Window *BX_create_additional_screen (void) extern Window *BX_create_additional_screen (void)
{ {
Window *win; Window *win;
Screen *oldscreen, Screen *new;
*new;
oldscreen = current_window->screen;
new = create_new_screen(); new = create_new_screen();
win = new_window(new); win = new_window(new);
gui_new_window(new, win); gui_new_window(new, win);
@@ -1840,7 +1835,6 @@ Screen *screen;
void do_screens (fd_set *rd) void do_screens (fd_set *rd)
{ {
Screen *screen; Screen *screen;
unsigned char buffer[IO_BUFFER_SIZE + 1];
if (!use_input) if (!use_input)
return; return;
@@ -1869,6 +1863,7 @@ void do_screens (fd_set *rd)
if (dumb_mode) if (dumb_mode)
{ {
char buffer[IO_BUFFER_SIZE + 1];
if (dgets(buffer, screen->fdin, 0, IO_BUFFER_SIZE, NULL)) if (dgets(buffer, screen->fdin, 0, IO_BUFFER_SIZE, NULL))
{ {
*(buffer + strlen(buffer) - 1) = '\0'; *(buffer + strlen(buffer) - 1) = '\0';
@@ -1886,7 +1881,7 @@ void do_screens (fd_set *rd)
else else
{ {
int server; int server;
unsigned char loc_buffer[BIG_BUFFER_SIZE + 1]; char loc_buffer[BIG_BUFFER_SIZE + 1];
int n, i; int n, i;
server = from_server; server = from_server;
@@ -1906,7 +1901,7 @@ void do_screens (fd_set *rd)
{ {
#ifdef __EMXPM__ #ifdef __EMXPM__
if (loc_buffer[i] == '\0') if (loc_buffer[i] == '\0')
loc_buffer[i] = '\e'; loc_buffer[i] = '\x1b'; /* ESC */
#endif #endif
if (!extended_handled) if (!extended_handled)
edit_char(loc_buffer[i]); edit_char(loc_buffer[i]);