Commit fcc19af8 authored by unknown's avatar unknown
Browse files

Remove unused (and incorrect) my_lread() and my_lwrite() 


BitKeeper/deleted/.del-my_lwrite.c:
  Delete: mysys/my_lwrite.c
BitKeeper/deleted/.del-my_lread.c:
  Delete: mysys/my_lread.c
parent 82c6098f

mysys/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ ADD_LIBRARY(mysys array.c charset-def.c charset.c checksum.c default.c default_m 
				my_clock.c my_compress.c my_conio.c my_copy.c my_crc32.c my_create.c my_delete.c

				my_div.c my_error.c my_file.c my_fopen.c my_fstream.c my_gethostbyname.c 

				my_gethwaddr.c my_getopt.c my_getsystime.c my_getwd.c my_handler.c my_init.c

				my_lib.c my_lock.c my_lockmem.c my_lread.c my_lwrite.c my_malloc.c my_messnc.c

				my_lib.c my_lock.c my_lockmem.c my_malloc.c my_messnc.c

				my_mkdir.c my_mmap.c my_net.c my_once.c my_open.c my_pread.c my_pthread.c 

				my_quick.c my_read.c my_realloc.c my_redel.c my_rename.c my_seek.c my_sleep.c

				my_static.c my_symlink.c my_symlink2.c my_sync.c my_thr_init.c my_wincond.c

mysys/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ libmysys_a_SOURCES = my_init.c my_getwd.c mf_getdate.c my_mmap.c \ 
			tree.c trie.c list.c hash.c array.c string.c typelib.c \

			my_copy.c my_append.c my_lib.c \

			my_delete.c my_rename.c my_redel.c \

			my_chsize.c my_lread.c my_lwrite.c my_clock.c \

			my_chsize.c my_clock.c \

			my_quick.c my_lockmem.c my_static.c \

			my_sync.c my_getopt.c my_mkdir.c \

			default_modify.c default.c \

mysys/make-ccc

+1 −1
Original line number Diff line number Diff line 
rm -f .deps/* raid.o mf_iocache.o libmysys.a

ccc -DDEFAULT_BASEDIR="\"/usr/local/mysql\"" -DDATADIR="\"/usr/local/mysql/var\"" -DHAVE_CONFIG_H -I./../include -I../include -I.. -DDBUG_OFF -fast -O3 -fomit-frame-pointer -c array.c checksum.c default.c errors.c getopt.c getopt1.c getvar.c hash.c list.c mf_brkhant.c mf_cache.c mf_casecnv.c mf_dirname.c mf_fn_ext.c mf_format.c mf_getdate.c mf_keycache.c mf_loadpath.c mf_pack.c mf_pack2.c mf_path.c mf_qsort.c mf_qsort2.c mf_radix.c mf_reccache.c mf_same.c mf_sort.c mf_soundex.c mf_stripp.c mf_unixpath.c mf_wcomp.c mf_wfile.c mulalloc.c my_alarm.c my_alloc.c my_append.c my_chsize.c my_clock.c my_compress.c my_copy.c my_create.c my_delete.c my_div.c my_error.c my_fopen.c my_fstream.c my_getwd.c my_init.c my_lib.c my_lockmem.c my_lread.c my_lwrite.c my_malloc.c my_messnc.c my_mkdir.c my_net.c my_once.c my_open.c my_pread.c my_pthread.c my_quick.c my_read.c my_realloc.c my_redel.c my_rename.c my_seek.c my_static.c my_tempnam.c my_thr_init.c my_write.c ptr_cmp.c queues.c safemalloc.c string.c thr_alarm.c thr_lock.c thr_mutex.c thr_rwlock.c tree.c typelib.c

ccc -DDEFAULT_BASEDIR="\"/usr/local/mysql\"" -DDATADIR="\"/usr/local/mysql/var\"" -DHAVE_CONFIG_H -I./../include -I../include -I.. -DDBUG_OFF -fast -O3 -fomit-frame-pointer -c array.c checksum.c default.c errors.c getopt.c getopt1.c getvar.c hash.c list.c mf_brkhant.c mf_cache.c mf_casecnv.c mf_dirname.c mf_fn_ext.c mf_format.c mf_getdate.c mf_keycache.c mf_loadpath.c mf_pack.c mf_pack2.c mf_path.c mf_qsort.c mf_qsort2.c mf_radix.c mf_reccache.c mf_same.c mf_sort.c mf_soundex.c mf_stripp.c mf_unixpath.c mf_wcomp.c mf_wfile.c mulalloc.c my_alarm.c my_alloc.c my_append.c my_chsize.c my_clock.c my_compress.c my_copy.c my_create.c my_delete.c my_div.c my_error.c my_fopen.c my_fstream.c my_getwd.c my_init.c my_lib.c my_lockmem.c my_malloc.c my_messnc.c my_mkdir.c my_net.c my_once.c my_open.c my_pread.c my_pthread.c my_quick.c my_read.c my_realloc.c my_redel.c my_rename.c my_seek.c my_static.c my_tempnam.c my_thr_init.c my_write.c ptr_cmp.c queues.c safemalloc.c string.c thr_alarm.c thr_lock.c thr_mutex.c thr_rwlock.c tree.c typelib.c

make raid.o mf_iocache.o my_lock.o

ar -cr libmysys.a array.o raid.o mf_iocache.o my_lock.o

mysys/my_lread.c

deleted100644 → 0
+0 −55
Original line number Diff line number Diff line 
/* 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; either version 2 of the License, or

   (at your option) any later version.



   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 */



#include "mysys_priv.h"

#include "mysys_err.h"



	/* Read a chunk of bytes from a file  */



uint32 my_lread(int Filedes, byte *Buffer, uint32 Count, myf MyFlags)

				/* File descriptor */

				/* Buffer must be at least count bytes */

				/* Max number of bytes returnd */

				/* Flags on what to do on error */

{

  uint32 readbytes;

  DBUG_ENTER("my_lread");

  DBUG_PRINT("my",("Fd: %d  Buffer: %ld  Count: %ld  MyFlags: %d",

		   Filedes, Buffer, Count, MyFlags));



  DBUG_PRINT("error", ("Deprecated my_lread() function should not be used."));



  /* Temp hack to get count to int32 while read wants int */

  if ((readbytes = (uint32) read(Filedes, Buffer, (uint) Count)) != Count)

  {

    my_errno=errno;

    if (MyFlags & (MY_WME | MY_FAE | MY_FNABP))

    {

      if (readbytes == MY_FILE_ERROR)

	my_error(EE_READ, MYF(ME_BELL+ME_WAITTANG),

		 my_filename(Filedes),errno);

      else

      if (MyFlags & (MY_NABP | MY_FNABP))

	my_error(EE_EOFERR, MYF(ME_BELL+ME_WAITTANG),

		 my_filename(Filedes),errno);

    }

    if (readbytes == MY_FILE_ERROR || MyFlags & (MY_NABP | MY_FNABP))

      DBUG_RETURN((uint32) -1);		/* Return med felkod */

  }

  if (MyFlags & (MY_NABP | MY_FNABP))

    DBUG_RETURN(0);			/* Ok vid l{sning */

  DBUG_RETURN(readbytes);

} /* my_lread */

mysys/my_lwrite.c

deleted100644 → 0
+0 −48
Original line number Diff line number Diff line 
/* 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; either version 2 of the License, or

   (at your option) any later version.



   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 */



#include "mysys_priv.h"

#include "mysys_err.h"



	/* Write a chunk of bytes to a file */



uint32 my_lwrite(int Filedes, const byte *Buffer, uint32 Count, myf MyFlags)

{

  uint32 writenbytes;

  DBUG_ENTER("my_lwrite");

  DBUG_PRINT("my",("Fd: %d  Buffer: 0x%lx  Count: %ld  MyFlags: %d",

		   Filedes, Buffer, Count, MyFlags));



  DBUG_PRINT("error", ("Deprecated my_lwrite() function should not be used."));



  /* Temp hack to get count to int32 while write wants int */

  if ((writenbytes = (uint32) write(Filedes, Buffer, (uint) Count)) != Count)

  {

    my_errno=errno;

    if (writenbytes == (uint32) -1 || MyFlags & (MY_NABP | MY_FNABP))

    {

      if (MyFlags & (MY_WME | MY_FAE | MY_FNABP))

      {

	my_error(EE_WRITE, MYF(ME_BELL+ME_WAITTANG),

		 my_filename(Filedes),errno);

      }

      DBUG_RETURN((uint32) -1);		/* Return med felkod */

    }

  }

  if (MyFlags & (MY_NABP | MY_FNABP))

    DBUG_RETURN(0);			/* Ok vid l{sning */

  DBUG_RETURN(writenbytes);

} /* my_lwrite */