Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Cleaned up mistakes in irc.c

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5810 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
Lance 2006-03-30 14:57:12 +00:00
parent e40f27bfa9
commit 3e2fb9c9b0
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog-Trunk.txt
View File

@ -6,6 +6,7 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/03/30
* Added execution of OnInterIfInit, OnCharIfInit and OnInterIfInitOnce on script
reload. [Lance]
* Cleaned up mistakes in irc.c [Lance]
2006/03/29
* Now none of the pet-menu options will have any effect when the pet's

20
src/map/irc.c
View File

@ -203,7 +203,7 @@ void irc_parse_sub(int fd, char *incoming_string)
char *source_nick=NULL;
char *source_ident=NULL;
char *source_host=NULL;
// char *state_mgr=NULL;
char *state_mgr=NULL;
memset(source,'\0',256);
memset(command,'\0',256);
@ -214,10 +214,9 @@ void irc_parse_sub(int fd, char *incoming_string)
sscanf(incoming_string, ":%255s %255s %255s :%4095[^\n]", source, command, target, message);
if (source != NULL) {
if (strstr(source,"!") != NULL) {
sscanf(source,"%s!%s@%s",source_nick, source_ident, source_host);
//source_nick = strtok_r(source,"!",&state_mgr);
//source_ident = strtok_r(NULL,"@",&state_mgr);
//source_host = strtok_r(NULL,"%%",&state_mgr);
source_nick = strtok_r(source,"!",&state_mgr);
source_ident = strtok_r(NULL,"@",&state_mgr);
source_host = strtok_r(NULL,"%%",&state_mgr);
}
}
if (irc_si->state == 0){
@ -256,20 +255,15 @@ void irc_parse_sub(int fd, char *incoming_string)
int send_to_parser(int fd, char *input,char key[2])
{
char format[4];
char *temp_string=NULL;
char *next_string=NULL;
// char *state_mgr=NULL;
char *state_mgr=NULL;
int total_loops=0;
//temp_string = strtok_r(input,key,&state_mgr);
sprintf(format,"%s%s%s","%s",key,"%s");
sscanf(input, format, temp_string, next_string);
temp_string = strtok_r(input,key,&state_mgr);
while (temp_string != NULL){
total_loops = total_loops+1;
irc_parse_sub(fd,temp_string);
//temp_string = strtok_r(NULL,key,&state_mgr);
sscanf(next_string, format, temp_string, next_string);
temp_string = strtok_r(NULL,key,&state_mgr);
}
return total_loops;
}

2
src/mysql/my_global.h
View File

@ -658,7 +658,7 @@ typedef SOCKET_SIZE_TYPE size_socket;
#define SET_STACK_SIZE(X) /* Not needed on real machines */
#if !defined(HAVE_mit_thread) && !defined(HAVE_STRTOK_R)
#define strtok_r(A,B,C) strtok((A),(B))
#include "../common/strlib.h"
#endif
/* Remove some things that mit_thread break or doesn't support */