database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

srv_add_path_separator_if_needed: be static; use memcpy, not sprintf

Browse Source 
innobase/include/srv0start.h:
  Remove unused functions
innobase/srv/srv0start.c:
  srv_add_path_separator_if_needed: Replace sprintf with memcpy
This commit is contained in:
unknown
2004-02-19 14:56:19 +02:00
parent 731fd9c5e0
commit f443541a36
2 changed files with 10 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
innobase/include/srv0start.h
View File

@ -20,16 +20,6 @@ srv_normalize_path_for_win(
/*=======================*/ /*=======================*/
char* str); /* in/out: null-terminated character string */ char* str); /* in/out: null-terminated character string */
/************************************************************************* /*************************************************************************
Adds a slash or a backslash to the end of a string if it is missing
and the string is not empty. */
char*
srv_add_path_separator_if_needed(
/*=============================*/
/* out, own: string which has the separator if the
string is not empty */
char* str); /* in: null-terminated character string */
/*************************************************************************
Reads the data files and their sizes from a character string given in Reads the data files and their sizes from a character string given in
the .cnf file. */ the .cnf file. */

25
innobase/srv/srv0start.c
View File

@ -441,9 +441,9 @@ io_handler_thread(
} }
#ifdef __WIN__ #ifdef __WIN__
#define SRV_PATH_SEPARATOR "\\" #define SRV_PATH_SEPARATOR '\\'
#else #else
#define SRV_PATH_SEPARATOR "/" #define SRV_PATH_SEPARATOR '/'
#endif #endif
/************************************************************************* /*************************************************************************
@ -470,31 +470,26 @@ srv_normalize_path_for_win(
Adds a slash or a backslash to the end of a string if it is missing Adds a slash or a backslash to the end of a string if it is missing
and the string is not empty. */ and the string is not empty. */
static
char* char*
srv_add_path_separator_if_needed( srv_add_path_separator_if_needed(
/*=============================*/ /*=============================*/
/* out, own: string which has the separator if the /* out: string which has the separator if the
string is not empty */ string is not empty */
char* str) /* in: null-terminated character string */ char* str) /* in: null-terminated character string */
{ {
char* out_str; char* out_str;
ulint len = ut_strlen(str);
if (ut_strlen(str) == 0) { if (len == 0 || str[len - 1] == SRV_PATH_SEPARATOR) {
return(str); return(str);
} }
if (str[ut_strlen(str) - 1] == SRV_PATH_SEPARATOR[0]) { out_str = ut_malloc(len + 2);
out_str = ut_malloc(ut_strlen(str) + 1); memcpy(out_str, str, len);
out_str[len] = SRV_PATH_SEPARATOR;
sprintf(out_str, "%s", str); out_str[len + 1] = 0;
return(out_str);
}
out_str = ut_malloc(ut_strlen(str) + 2);
sprintf(out_str, "%s%s", str, SRV_PATH_SEPARATOR);
return(out_str); return(out_str);
} }