mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +01:00
9a9e8d2311
---------------------------------------------------------------------- ChangeSet@1.2571, 2008-04-08 12:30:06+02:00, vvaintroub@wva. +122 -0 Bug#32082 : definition of VOID in my_global.h conflicts with Windows SDK headers VOID macro is now removed. Its usage is replaced with void cast. In some cases, where cast does not make much sense (pthread_*, printf, hash_delete, my_seek), cast is ommited. client/mysqladmin.cc: Bug#32082 : remove VOID macro client/mysqldump.c: Bug#32082 : remove VOID macro client/mysqlimport.c: Bug#32082 : remove VOID macro client/mysqlslap.c: Bug#32082 : remove VOID macro client/mysqltest.cc: Bug#32082 : remove VOID macro client/sql_string.cc: Bug#32082 : remove VOID macro extra/comp_err.c: Bug#32082 : remove VOID macro extra/replace.c: Bug#32082 : remove VOID macro include/my_alarm.h: Bug#32082 : remove VOID macro include/my_global.h: Bug#32082 : remove VOID macro libmysql/libmysql.c: Bug#32082 : remove VOID macro mysys/errors.c: Bug#32082 : remove VOID macro mysys/hash.c: Bug#32082 : remove VOID macro mysys/mf_iocache2.c: Bug#32082 : remove VOID macro mysys/mf_loadpath.c: Bug#32082 : remove VOID macro mysys/mf_path.c: Bug#32082 : remove VOID macro mysys/my_append.c: Bug#32082 : remove VOID macro mysys/my_clock.c: Bug#32082 : remove VOID macro mysys/my_copy.c: Bug#32082 : remove VOID macro mysys/my_fstream.c: Bug#32082 : remove VOID macro mysys/my_getwd.c: Bug#32082 : remove VOID macro mysys/my_lib.c: Bug#32082 : remove VOID macro mysys/my_lockmem.c: Bug#32082 : remove VOID macro mysys/my_pthread.c: Bug#32082 : remove VOID macro mysys/my_redel.c: Bug#32082 : remove VOID macro mysys/stacktrace.c: Bug#32082 : remove VOID macro mysys/thr_alarm.c: Bug#32082 : remove VOID macro mysys/thr_lock.c: Bug#32082 : remove VOID macro sql/derror.cc: Bug#32082 : remove VOID macro sql/des_key_file.cc: Bug#32082 : remove VOID macro sql/discover.cc: Bug#32082 : remove VOID macro sql/field.cc: Bug#32082 : remove VOID macro sql/filesort.cc: Bug#32082 : remove VOID macro sql/ha_ndbcluster.cc: Bug#32082 : remove VOID macro sql/ha_partition.cc: Bug#32082 : remove VOID macro sql/handler.cc: Bug#32082 : remove VOID macro sql/hostname.cc: Bug#32082 : remove VOID macro sql/init.cc: Bug#32082 : remove VOID macro sql/item.cc: Bug#32082 : remove VOID macro sql/item_cmpfunc.cc: Bug#32082 : remove VOID macro sql/item_strfunc.cc: Bug#32082 : remove VOID macro sql/lock.cc: Bug#32082 : remove VOID macro sql/log.cc: Bug#32082 : remove VOID macro sql/log_event.cc: Bug#32082 : remove VOID macro sql/mysqld.cc: Bug#32082 : remove VOID macro sql/opt_range.h: Bug#32082 : remove VOID macro sql/protocol.cc: Bug#32082 : remove VOID macro sql/records.cc: Bug#32082 : remove VOID macro sql/sp_head.cc: Bug#32082 : remove VOID macro sql/sp_pcontext.cc: Bug#32082 : remove VOID macro sql/sql_acl.cc: Bug#32082 : remove VOID macro sql/sql_base.cc: Bug#32082 : remove VOID macro sql/sql_cache.cc: Bug#32082 : remove VOID macro sql/sql_connect.cc: Bug#32082 : remove VOID macro sql/sql_db.cc: Bug#32082 : remove VOID macro sql/sql_delete.cc: Bug#32082 : remove VOID macro sql/sql_handler.cc: Bug#32082 : remove VOID macro sql/sql_insert.cc: Bug#32082 : remove VOID macro sql/sql_map.cc: Bug#32082 : remove VOID macro sql/sql_parse.cc: Bug#32082 : remove VOID macro sql/sql_select.cc: Bug#32082 : remove VOID macro sql/sql_servers.cc: Bug#32082 : remove VOID macro sql/sql_show.cc: Bug#32082 : remove VOID macro sql/sql_string.cc: Bug#32082 : remove VOID macro sql/sql_table.cc: Bug#32082 : remove VOID macro sql/sql_test.cc: Bug#32082 : remove VOID macro sql/sql_trigger.cc: Bug#32082 : remove VOID macro sql/sql_update.cc: Bug#32082 : remove VOID macro sql/sql_view.cc: Bug#32082 : remove VOID macro sql/table.cc: Bug#32082 : remove VOID macro sql/tztime.cc: Bug#32082 : remove VOID macro sql/udf_example.c: Bug#32082 : remove VOID macro sql/uniques.cc: Bug#32082 : remove VOID macro sql/unireg.cc: Bug#32082 : remove VOID macro storage/archive/ha_archive.cc: Bug#32082 : remove VOID macro storage/blackhole/ha_blackhole.cc: Bug#32082 : remove VOID macro storage/csv/ha_tina.cc: Bug#32082 : remove VOID macro storage/csv/transparent_file.cc: Bug#32082 : remove VOID macro storage/example/ha_example.cc: Bug#32082 : remove VOID macro storage/federated/ha_federated.cc: Bug#32082 : remove VOID macro storage/heap/hp_clear.c: Bug#32082 : remove VOID macro storage/heap/hp_create.c: Bug#32082 : remove VOID macro storage/heap/hp_test1.c: Bug#32082 : remove VOID macro storage/heap/hp_test2.c: Bug#32082 : remove VOID macro storage/innobase/handler/ha_innodb.cc: Bug#32082 : remove VOID macro storage/myisam/ft_eval.c: Bug#32082 : remove VOID macro storage/myisam/ha_myisam.cc: Bug#32082 : remove VOID macro storage/myisam/mi_changed.c: Bug#32082 : remove VOID macro storage/myisam/mi_check.c: Bug#32082 : remove VOID macro storage/myisam/mi_close.c: Bug#32082 : remove VOID macro storage/myisam/mi_create.c: Bug#32082 : remove VOID macro storage/myisam/mi_dbug.c: Bug#32082 : remove VOID macro storage/myisam/mi_delete.c: Bug#32082 : remove VOID macro storage/myisam/mi_delete_all.c: Bug#32082 : remove VOID macro storage/myisam/mi_dynrec.c: Bug#32082 : remove VOID macro storage/myisam/mi_info.c: Bug#32082 : remove VOID macro storage/myisam/mi_locking.c: Bug#32082 : remove VOID macro storage/myisam/mi_log.c: Bug#32082 : remove VOID macro storage/myisam/mi_open.c: Bug#32082 : remove VOID macro storage/myisam/mi_packrec.c: Bug#32082 : remove VOID macro storage/myisam/mi_panic.c: Bug#32082 : remove VOID macro storage/myisam/mi_rsame.c: Bug#32082 : remove VOID macro storage/myisam/mi_statrec.c: Bug#32082 : remove VOID macro storage/myisam/mi_test1.c: Bug#32082 : remove VOID macro storage/myisam/mi_test2.c: Bug#32082 : remove VOID macro storage/myisam/mi_test3.c: Bug#32082 : remove VOID macro storage/myisam/mi_update.c: Bug#32082 : remove VOID macro storage/myisam/mi_write.c: Bug#32082 : remove VOID macro storage/myisam/myisamchk.c: Bug#32082 : remove VOID macro storage/myisam/myisamlog.c: Bug#32082 : remove VOID macro storage/myisam/myisampack.c: Bug#32082 : remove VOID macro storage/myisam/sort.c: Bug#32082 : remove VOID macro storage/myisammrg/myrg_close.c: Bug#32082 : remove VOID macro storage/myisammrg/myrg_create.c: Bug#32082 : remove VOID macro storage/myisammrg/myrg_open.c: Bug#32082 : remove VOID macro strings/str_test.c: Bug#32082 : remove VOID macro tests/thread_test.c: Bug#32082 : remove VOID macro
195 lines
5.1 KiB
C
195 lines
5.1 KiB
C
/* Copyright (C) 2000 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
/* USE_MY_STREAM isn't set because we can't thrust my_fclose! */
|
|
|
|
#include "mysys_priv.h"
|
|
#include "mysys_err.h"
|
|
#include <errno.h>
|
|
#include <stdio.h>
|
|
|
|
#ifdef HAVE_FSEEKO
|
|
#undef ftell
|
|
#undef fseek
|
|
#define ftell(A) ftello(A)
|
|
#define fseek(A,B,C) fseeko((A),(B),(C))
|
|
#endif
|
|
|
|
/*
|
|
Read a chunk of bytes from a FILE
|
|
|
|
SYNOPSIS
|
|
my_fread()
|
|
stream File descriptor
|
|
Buffer Buffer to read to
|
|
Count Number of bytes to read
|
|
MyFlags Flags on what to do on error
|
|
|
|
RETURN
|
|
(size_t) -1 Error
|
|
# Number of bytes read
|
|
*/
|
|
|
|
size_t my_fread(FILE *stream, uchar *Buffer, size_t Count, myf MyFlags)
|
|
{
|
|
size_t readbytes;
|
|
DBUG_ENTER("my_fread");
|
|
DBUG_PRINT("my",("stream: 0x%lx Buffer: 0x%lx Count: %u MyFlags: %d",
|
|
(long) stream, (long) Buffer, (uint) Count, MyFlags));
|
|
|
|
if ((readbytes= fread(Buffer, sizeof(char), Count, stream)) != Count)
|
|
{
|
|
DBUG_PRINT("error",("Read only %d bytes", (int) readbytes));
|
|
if (MyFlags & (MY_WME | MY_FAE | MY_FNABP))
|
|
{
|
|
if (ferror(stream))
|
|
my_error(EE_READ, MYF(ME_BELL+ME_WAITTANG),
|
|
my_filename(my_fileno(stream)),errno);
|
|
else
|
|
if (MyFlags & (MY_NABP | MY_FNABP))
|
|
my_error(EE_EOFERR, MYF(ME_BELL+ME_WAITTANG),
|
|
my_filename(my_fileno(stream)),errno);
|
|
}
|
|
my_errno=errno ? errno : -1;
|
|
if (ferror(stream) || MyFlags & (MY_NABP | MY_FNABP))
|
|
DBUG_RETURN((size_t) -1); /* Return with error */
|
|
}
|
|
if (MyFlags & (MY_NABP | MY_FNABP))
|
|
DBUG_RETURN(0); /* Read ok */
|
|
DBUG_RETURN(readbytes);
|
|
} /* my_fread */
|
|
|
|
|
|
/*
|
|
Write a chunk of bytes to a stream
|
|
|
|
my_fwrite()
|
|
stream File descriptor
|
|
Buffer Buffer to write from
|
|
Count Number of bytes to write
|
|
MyFlags Flags on what to do on error
|
|
|
|
RETURN
|
|
(size_t) -1 Error
|
|
# Number of bytes written
|
|
*/
|
|
|
|
size_t my_fwrite(FILE *stream, const uchar *Buffer, size_t Count, myf MyFlags)
|
|
{
|
|
size_t writtenbytes =0;
|
|
my_off_t seekptr;
|
|
#if !defined(NO_BACKGROUND) && defined(USE_MY_STREAM)
|
|
uint errors;
|
|
#endif
|
|
DBUG_ENTER("my_fwrite");
|
|
DBUG_PRINT("my",("stream: 0x%lx Buffer: 0x%lx Count: %u MyFlags: %d",
|
|
(long) stream, (long) Buffer, (uint) Count, MyFlags));
|
|
|
|
#if !defined(NO_BACKGROUND) && defined(USE_MY_STREAM)
|
|
errors=0;
|
|
#endif
|
|
seekptr= ftell(stream);
|
|
for (;;)
|
|
{
|
|
size_t written;
|
|
if ((written = (size_t) fwrite((char*) Buffer,sizeof(char),
|
|
Count, stream)) != Count)
|
|
{
|
|
DBUG_PRINT("error",("Write only %d bytes", (int) writtenbytes));
|
|
my_errno=errno;
|
|
if (written != (size_t) -1)
|
|
{
|
|
seekptr+=written;
|
|
Buffer+=written;
|
|
writtenbytes+=written;
|
|
Count-=written;
|
|
}
|
|
#ifdef EINTR
|
|
if (errno == EINTR)
|
|
{
|
|
(void) my_fseek(stream,seekptr,MY_SEEK_SET,MYF(0));
|
|
continue;
|
|
}
|
|
#endif
|
|
#if !defined(NO_BACKGROUND) && defined(USE_MY_STREAM)
|
|
#ifdef THREAD
|
|
if (my_thread_var->abort)
|
|
MyFlags&= ~ MY_WAIT_IF_FULL; /* End if aborted by user */
|
|
#endif
|
|
if ((errno == ENOSPC || errno == EDQUOT) &&
|
|
(MyFlags & MY_WAIT_IF_FULL))
|
|
{
|
|
wait_for_free_space("[stream]", errors);
|
|
errors++;
|
|
(void) my_fseek(stream,seekptr,MY_SEEK_SET,MYF(0));
|
|
continue;
|
|
}
|
|
#endif
|
|
if (ferror(stream) || (MyFlags & (MY_NABP | MY_FNABP)))
|
|
{
|
|
if (MyFlags & (MY_WME | MY_FAE | MY_FNABP))
|
|
{
|
|
my_error(EE_WRITE, MYF(ME_BELL+ME_WAITTANG),
|
|
my_filename(my_fileno(stream)),errno);
|
|
}
|
|
writtenbytes= (size_t) -1; /* Return that we got error */
|
|
break;
|
|
}
|
|
}
|
|
if (MyFlags & (MY_NABP | MY_FNABP))
|
|
writtenbytes= 0; /* Everything OK */
|
|
else
|
|
writtenbytes+= written;
|
|
break;
|
|
}
|
|
DBUG_RETURN(writtenbytes);
|
|
} /* my_fwrite */
|
|
|
|
|
|
/* Seek to position in file */
|
|
|
|
my_off_t my_fseek(FILE *stream, my_off_t pos, int whence,
|
|
myf MyFlags __attribute__((unused)))
|
|
{
|
|
DBUG_ENTER("my_fseek");
|
|
DBUG_PRINT("my",("stream: 0x%lx pos: %lu whence: %d MyFlags: %d",
|
|
(long) stream, (long) pos, whence, MyFlags));
|
|
DBUG_RETURN(fseek(stream, (off_t) pos, whence) ?
|
|
MY_FILEPOS_ERROR : (my_off_t) ftell(stream));
|
|
} /* my_seek */
|
|
|
|
|
|
/* Tell current position of file */
|
|
|
|
my_off_t my_ftell(FILE *stream, myf MyFlags __attribute__((unused)))
|
|
{
|
|
off_t pos;
|
|
DBUG_ENTER("my_ftell");
|
|
DBUG_PRINT("my",("stream: 0x%lx MyFlags: %d", (long) stream, MyFlags));
|
|
pos=ftell(stream);
|
|
DBUG_PRINT("exit",("ftell: %lu",(ulong) pos));
|
|
DBUG_RETURN((my_off_t) pos);
|
|
} /* my_ftell */
|
|
|
|
|
|
/* Get a File corresponding to the stream*/
|
|
int my_fileno(FILE *f)
|
|
{
|
|
#ifdef _WIN32
|
|
return my_win_fileno(f);
|
|
#else
|
|
return fileno(f);
|
|
#endif
|
|
}
|