From b11bf6e1604097711291265f927e79e8f2af5c54 Mon Sep 17 00:00:00 2001 From: greenboxal2 Date: Sun, 25 Nov 2012 21:20:43 +0000 Subject: Applied AStyle code formating as discussed on tid:74602. Removed /SAFESEH option from MSVC11 projects. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16968 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/common/strlib.h | 119 +++++++++++++++++++++++++--------------------------- 1 file changed, 58 insertions(+), 61 deletions(-) (limited to 'src/common/strlib.h') diff --git a/src/common/strlib.h b/src/common/strlib.h index bbc2c6105..ae4f688c2 100644 --- a/src/common/strlib.h +++ b/src/common/strlib.h @@ -11,66 +11,65 @@ #include #undef __USE_GNU -char* jstrescape (char* pt); -char* jstrescapecpy (char* pt, const char* spt); -int jmemescapecpy (char* pt, const char* spt, int size); +char *jstrescape(char *pt); +char *jstrescapecpy(char *pt, const char *spt); +int jmemescapecpy(char *pt, const char *spt, int size); -int remove_control_chars(char* str); -char* trim(char* str); -char* normalize_name(char* str,const char* delims); +int remove_control_chars(char *str); +char *trim(char *str); +char *normalize_name(char *str,const char *delims); 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 #if !(defined(WIN32) && defined(_MSC_VER) && _MSC_VER >= 1400) && !defined(HAVE_STRNLEN) -size_t strnlen (const char* string, size_t maxlen); +size_t strnlen(const char *string, size_t maxlen); #endif #if defined(WIN32) && defined(_MSC_VER) && _MSC_VER <= 1200 -uint64 strtoull(const char* str, char** endptr, int base); +uint64 strtoull(const char *str, char **endptr, int base); #endif -int e_mail_check(char* email); -int config_switch(const char* str); +int e_mail_check(char *email); +int config_switch(const char *str); /// strncpy that always nul-terminates the string -char* safestrncpy(char* dst, const char* src, size_t n); +char *safestrncpy(char *dst, const char *src, size_t n); /// doesn't crash on null pointer -size_t safestrnlen(const char* string, size_t maxlen); +size_t safestrnlen(const char *string, size_t maxlen); /// Works like snprintf, but always nul-terminates the buffer. /// Returns the size of the string (without nul-terminator) /// or -1 if the buffer is too small. -int safesnprintf(char* buf, size_t sz, const char* fmt, ...); +int safesnprintf(char *buf, size_t sz, const char *fmt, ...); /// Returns the line of the target position in the string. /// Lines start at 1. -int strline(const char* str, size_t pos); +int strline(const char *str, size_t pos); /// Produces the hexadecimal representation of the given input. /// The output buffer must be at least count*2+1 in size. /// Returns true on success, false on failure. -bool bin2hex(char* output, unsigned char* input, size_t count); +bool bin2hex(char *output, unsigned char *input, size_t count); /// Bitfield determining the behaviour of sv_parse and sv_split. -typedef enum e_svopt -{ - // default: no escapes and no line terminator - SV_NOESCAPE_NOTERMINATE = 0, - // Escapes according to the C compiler. - SV_ESCAPE_C = 1, - // Line terminators - SV_TERMINATE_LF = 2, - SV_TERMINATE_CRLF = 4, - SV_TERMINATE_CR = 8, - // If sv_split keeps the end of line terminator, instead of replacing with '\0' - SV_KEEP_TERMINATOR = 16 +typedef enum e_svopt { + // default: no escapes and no line terminator + SV_NOESCAPE_NOTERMINATE = 0, + // Escapes according to the C compiler. + SV_ESCAPE_C = 1, + // Line terminators + SV_TERMINATE_LF = 2, + SV_TERMINATE_CRLF = 4, + SV_TERMINATE_CR = 8, + // If sv_split keeps the end of line terminator, instead of replacing with '\0' + SV_KEEP_TERMINATOR = 16 } e_svopt; /// Other escape sequences supported by the C compiler. @@ -78,16 +77,15 @@ typedef enum e_svopt /// Parse state. /// The field is [start,end[ -struct s_svstate -{ - const char* str; //< string to parse - int len; //< string length - int off; //< current offset in the string - int start; //< where the field starts - int end; //< where the field ends - enum e_svopt opt; //< parse options - char delim; //< field delimiter - bool done; //< if all the text has been parsed +struct s_svstate { + const char *str; //< string to parse + int len; //< string length + int off; //< current offset in the string + int start; //< where the field starts + int end; //< where the field ends + enum e_svopt opt; //< parse options + char delim; //< field delimiter + bool done; //< if all the text has been parsed }; /// Parses a single field in a delim-separated string. @@ -95,14 +93,14 @@ struct s_svstate /// /// @param sv Parse state /// @return 1 if a field was parsed, 0 if done, -1 on error. -int sv_parse_next(struct s_svstate* sv); +int sv_parse_next(struct s_svstate *sv); /// Parses a delim-separated string. /// Starts parsing at startoff and fills the pos array with position pairs. /// out_pos[0] and out_pos[1] are the start and end of line. /// Other position pairs are the start and end of fields. /// Returns the number of fields found or -1 if an error occurs. -int sv_parse(const char* str, int len, int startoff, char delim, int* out_pos, int npos, enum e_svopt opt); +int sv_parse(const char *str, int len, int startoff, char delim, int *out_pos, int npos, enum e_svopt opt); /// Splits a delim-separated string. /// WARNING: this function modifies the input string @@ -110,46 +108,45 @@ int sv_parse(const char* str, int len, int startoff, char delim, int* out_pos, i /// out_fields[0] is the start of the next line. /// Other entries are the start of fields (nul-teminated). /// Returns the number of fields found or -1 if an error occurs. -int sv_split(char* str, int len, int startoff, char delim, char** out_fields, int nfields, enum e_svopt opt); +int sv_split(char *str, int len, int startoff, char delim, char **out_fields, int nfields, enum e_svopt opt); /// Escapes src to out_dest according to the format of the C compiler. /// Returns the length of the escaped string. /// out_dest should be len*4+1 in size. -size_t sv_escape_c(char* out_dest, const char* src, size_t len, const char* escapes); +size_t sv_escape_c(char *out_dest, const char *src, size_t len, const char *escapes); /// Unescapes src to out_dest according to the format of the C compiler. /// Returns the length of the unescaped string. /// out_dest should be len+1 in size and can be the same buffer as src. -size_t sv_unescape_c(char* out_dest, const char* src, size_t len); +size_t sv_unescape_c(char *out_dest, const char *src, size_t len); /// Skips a C escape sequence (starting with '\\'). -const char* skip_escaped_c(const char* p); +const char *skip_escaped_c(const char *p); /// Opens and parses a file containing delim-separated columns, feeding them to the specified callback function row by row. /// Tracks the progress of the operation (current line number, number of successfully processed rows). /// Returns 'true' if it was able to process the specified file, or 'false' if it could not be read. -bool sv_readdb(const char* directory, const char* filename, char delim, int mincols, int maxcols, int maxrows, bool (*parseproc)(char* fields[], int columns, int current)); +bool sv_readdb(const char *directory, const char *filename, char delim, int mincols, int maxcols, int maxrows, bool (*parseproc)(char *fields[], int columns, int current)); /// StringBuf - dynamic string -struct StringBuf -{ - char *buf_; - char *ptr_; - unsigned int max_; +struct StringBuf { + char *buf_; + char *ptr_; + unsigned int max_; }; typedef struct StringBuf StringBuf; -StringBuf* StringBuf_Malloc(void); -void StringBuf_Init(StringBuf* self); -int StringBuf_Printf(StringBuf* self, const char* fmt, ...); -int StringBuf_Vprintf(StringBuf* self, const char* fmt, va_list args); -int StringBuf_Append(StringBuf* self, const StringBuf *sbuf); -int StringBuf_AppendStr(StringBuf* self, const char* str); -int StringBuf_Length(StringBuf* self); -char* StringBuf_Value(StringBuf* self); -void StringBuf_Clear(StringBuf* self); -void StringBuf_Destroy(StringBuf* self); -void StringBuf_Free(StringBuf* self); +StringBuf *StringBuf_Malloc(void); +void StringBuf_Init(StringBuf *self); +int StringBuf_Printf(StringBuf *self, const char *fmt, ...); +int StringBuf_Vprintf(StringBuf *self, const char *fmt, va_list args); +int StringBuf_Append(StringBuf *self, const StringBuf *sbuf); +int StringBuf_AppendStr(StringBuf *self, const char *str); +int StringBuf_Length(StringBuf *self); +char *StringBuf_Value(StringBuf *self); +void StringBuf_Clear(StringBuf *self); +void StringBuf_Destroy(StringBuf *self); +void StringBuf_Free(StringBuf *self); #endif /* _STRLIB_H_ */ -- cgit v1.2.3-70-g09d2