1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Formatting improved

Browse Source
This commit is contained in:
msvensson@neptunus.(none) 2005-11-04 12:15:49 +01:00
parent 4f26b44318
commit a6031b6425
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
client/mysqltest.c
View File

@ -2912,15 +2912,6 @@ int parse_args(int argc, char **argv)
return 0; return 0;
} }
char* safe_str_append(char *buf, const char *str, int size)
{
int i,c ;
for (i = 0; (c = *str++) && i < size - 1; i++)
*buf++ = c;
*buf = 0;
return buf;
}
/* /*
Write the content of str into file Write the content of str into file
@ -2931,6 +2922,7 @@ char* safe_str_append(char *buf, const char *str, int size)
str - content to write to file str - content to write to file
size - size of content witten to file size - size of content witten to file
*/ */
static void str_to_file(const char *fname, char *str, int size) static void str_to_file(const char *fname, char *str, int size)
{ {
int fd; int fd;
@ -2938,11 +2930,11 @@ static void str_to_file(const char *fname, char *str, int size)
if (!test_if_hard_path(fname)) if (!test_if_hard_path(fname))
{ {
strxmov(buff, opt_basedir, fname, NullS); strxmov(buff, opt_basedir, fname, NullS);
fname=buff; fname= buff;
} }
fn_format(buff,fname,"","",4); fn_format(buff,fname,"","",4);
if ((fd = my_open(buff, O_WRONLY | O_CREAT | O_TRUNC, if ((fd= my_open(buff, O_WRONLY | O_CREAT | O_TRUNC,
MYF(MY_WME | MY_FFNF))) < 0) MYF(MY_WME | MY_FFNF))) < 0)
die("Could not open %s: errno = %d", buff, errno); die("Could not open %s: errno = %d", buff, errno);
if (my_write(fd, (byte*)str, size, MYF(MY_WME|MY_FNABP))) if (my_write(fd, (byte*)str, size, MYF(MY_WME|MY_FNABP)))
@ -2950,6 +2942,7 @@ static void str_to_file(const char *fname, char *str, int size)
my_close(fd, MYF(0)); my_close(fd, MYF(0));
} }
void dump_result_to_reject_file(const char *record_file, char *buf, int size) void dump_result_to_reject_file(const char *record_file, char *buf, int size)
{ {
char reject_file[FN_REFLEN]; char reject_file[FN_REFLEN];
@ -2972,6 +2965,7 @@ static void replace_dynstr_append_mem(DYNAMIC_STRING *ds, const char *val,
dynstr_append_mem(ds, val, len); dynstr_append_mem(ds, val, len);
} }
/* Append zero-terminated string to ds, with optional replace */ /* Append zero-terminated string to ds, with optional replace */
static void replace_dynstr_append(DYNAMIC_STRING *ds, const char *val) static void replace_dynstr_append(DYNAMIC_STRING *ds, const char *val)
@ -3036,8 +3030,8 @@ static void append_result(DYNAMIC_STRING *ds, MYSQL_RES *res)
with '\t'. Values may be converted with 'replace_column' with '\t'. Values may be converted with 'replace_column'
*/ */
static void append_stmt_result(DYNAMIC_STRING *ds, MYSQL_STMT* stmt, static void append_stmt_result(DYNAMIC_STRING *ds, MYSQL_STMT *stmt,
MYSQL_FIELD* field, uint num_fields) MYSQL_FIELD *field, uint num_fields)
{ {
MYSQL_BIND *bind; MYSQL_BIND *bind;
my_bool *is_null; my_bool *is_null;
@ -3198,12 +3192,13 @@ static void append_metadata(DYNAMIC_STRING *ds,
} }
} }
/* /*
Append affected row count and other info to output Append affected row count and other info to output
*/ */
static void append_info(DYNAMIC_STRING* ds, ulong affected_rows, static void append_info(DYNAMIC_STRING *ds, ulong affected_rows,
const char* info) const char *info)
{ {
char buf[40]; char buf[40];
sprintf(buf,"affected rows: %lu\n", affected_rows); sprintf(buf,"affected rows: %lu\n", affected_rows);
@ -3220,8 +3215,9 @@ static void append_info(DYNAMIC_STRING* ds, ulong affected_rows,
/* /*
Display the table headings with the names tab separated Display the table headings with the names tab separated
*/ */
static void append_table_headings(DYNAMIC_STRING* ds,
MYSQL_FIELD* field, static void append_table_headings(DYNAMIC_STRING *ds,
MYSQL_FIELD *field,
uint num_fields) uint num_fields)
{ {
uint col_idx; uint col_idx;