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

Rework stripansicodes() to take a const char * argument rather than const unsigned char *,

Browse Source 
fixing a large number of warnings. 


git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@139 13b04d17-f746-0410-82c6-800466cd88b0
This commit is contained in:
Kevin Easton
2011-09-07 10:13:18 +00:00
parent 43aaf645e2
commit cc0a27d7fe
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/misc.h
View File

@@ -74,7 +74,7 @@ extern LastMsg last_sent_ctcp[2];
int check_split (char *, char *); int check_split (char *, char *);
void BX_userage (char *, char *); void BX_userage (char *, char *);
void stats_k_grep_end (void); void stats_k_grep_end (void);
char *stripansicodes (const unsigned char *); char *stripansicodes (const char *);
char *stripansi (unsigned char *); char *stripansi (unsigned char *);
NickTab *BX_gettabkey (int, int, char *); NickTab *BX_gettabkey (int, int, char *);
void BX_addtabkey (char *, char *, int); void BX_addtabkey (char *, char *, int);

18
source/misc.c
View File

@@ -1026,19 +1026,21 @@ struct {
#endif #endif
/* Borrowed with permission from FLiER */ /* Borrowed with permission from FLiER */
char *stripansicodes(const unsigned char *line) char *stripansicodes(const char *line)
{ {
register unsigned char *tstr; const char *tstr = line;
register unsigned char *nstr; char *nstr = (char *)newline1;
int gotansi = 0; int gotansi = 0;
tstr=(char *)line;
nstr=newline1;
while (*tstr) while (*tstr)
{ {
if (*tstr==0x1B || *tstr == 0x9b) /* Note that we use '\x9b' here, rather than 0x9b, because the
* former will have the correct value whether or not char is
* signed.
*/
if (*tstr == '\x1b' || *tstr == '\x9b')
gotansi = 1; gotansi = 1;
if (gotansi && isalpha(*tstr)) if (gotansi && isalpha((unsigned char)*tstr))
gotansi = 0; gotansi = 0;
else if (!gotansi) else if (!gotansi)
{ {
@@ -1051,7 +1053,7 @@ int gotansi=0;
return (char *)newline1; return (char *)newline1;
} }
#else #else
char *stripansicodes(const unsigned char *line) char *stripansicodes(const char *line)
{ {
return line; return line;
} }

2
source/status.c
View File

@@ -935,7 +935,7 @@ void make_status(Window *win)
strcmp(buffer, win->wset->status_line[status_line])) strcmp(buffer, win->wset->status_line[status_line]))
{ {
unsigned char *st = NULL; char *st = NULL;
malloc_strcpy(&win->wset->status_line[status_line], buffer); malloc_strcpy(&win->wset->status_line[status_line], buffer);
output_screen = win->screen; output_screen = win->screen;
st = cparse((line==3)?FORMAT_STATUS3_FSET:(line==2)?FORMAT_STATUS2_FSET:(line==1)?FORMAT_STATUS1_FSET:FORMAT_STATUS_FSET, buffer); st = cparse((line==3)?FORMAT_STATUS3_FSET:(line==2)?FORMAT_STATUS2_FSET:(line==1)?FORMAT_STATUS1_FSET:FORMAT_STATUS_FSET, buffer);