From 88a5d0cdda513357496b9d53878618e1620f47e8 Mon Sep 17 00:00:00 2001 From: ultramage Date: Thu, 5 Apr 2007 18:49:57 +0000 Subject: * Made a crazy attempt to at least partially synchronize login&char code * Major edit to the way the servers handle ip addresses, making them obey the "host byte order inside, network byte order outside" rule - hopefully covered all entry- and exit-points for IP address data - discovered several places where Gravity's client breaks the convention, will need to come up with a suitable countermeasure for that - other than that, the code should be portable, except for printing and ipban mask testing (those still assume a specific byte order) - tested both txt and sql in all usual situations; tested single- and multi-server setups, all seems to work (but watch out for hidden bugs!) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10162 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/common/strlib.h | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'src/common/strlib.h') diff --git a/src/common/strlib.h b/src/common/strlib.h index f9a6e41a3..332e823b9 100644 --- a/src/common/strlib.h +++ b/src/common/strlib.h @@ -4,25 +4,20 @@ #ifndef _STRLIB_H_ #define _STRLIB_H_ -#define J_MAX_MALLOC_SIZE 65535 -// String function library. -// code by Jioh L. Jung (ziozzang@4wish.net) -// This code is under license "BSD" char* jstrescape (char* pt); char* jstrescapecpy (char* pt, const char* spt); -int jmemescapecpy (char* pt,char* spt, int size); +int jmemescapecpy (char* pt, const char* spt, int size); + +int remove_control_chars(char *); +char *trim(char *str, const char *delim); +const char *stristr(const char *haystack, const char *needle); #ifdef __WIN32 #define HAVE_STRTOK_R #define strtok_r(s,delim,save_ptr) _strtok_r((s),(delim),(save_ptr)) -char *_strtok_r(char *s1, const char *s2, char **lasts); +char* _strtok_r(char* s1, const char* s2, char** lasts); #endif -// custom functions -int remove_control_chars(unsigned char *); -char *trim(char *str, const char *delim); -const char *stristr(const char *haystack, const char *needle); - #if !defined(WIN32) || (defined(_MSC_VER) && _MSC_VER < 1400) size_t strnlen (const char* string, size_t maxlen); #endif -- cgit v1.2.3-70-g09d2