mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 19:11:46 +01:00
def9c0b236
client/mysql_upgrade.c: Fixed problem with mysql_upgrade being dependent on local my.cnf files and problem with memory not being freed. client/mysqltest.c: Changed type to avoid warning. cmd-line-utils/readline/xmalloc.c: Fix to avoid warning. include/my_dbug.h: To disable parts from code in non-debug more. sql/field.cc: Fixed warning. sql/ha_archive.cc: Fixed warning. sql/ha_berkeley.cc: Added casts to avoid warnings. sql/ha_ndbcluster.cc: Fixed warnings. sql/log.cc: Added casts to avoid warnings. sql/slave.cc: Avoid warning. sql/sql_repl.cc: Avoid warning. support-files/compiler_warnings.supp: Added disabled warnings to compiler_warnings.supp file. These are backported mainly from 5.1 suppress file, but there are some additional new ones.
85 lines
2.2 KiB
C
85 lines
2.2 KiB
C
/* xmalloc.c -- safe versions of malloc and realloc */
|
|
|
|
/* Copyright (C) 1991 Free Software Foundation, Inc.
|
|
|
|
This file is part of GNU Readline, a library for reading lines
|
|
of text with interactive input and history editing.
|
|
|
|
Readline 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, or (at your option) any
|
|
later version.
|
|
|
|
Readline 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 Readline; see the file COPYING. If not, write to the Free
|
|
Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
|
|
#define READLINE_LIBRARY
|
|
|
|
#include "config_readline.h"
|
|
|
|
#include <stdio.h>
|
|
|
|
#if defined (HAVE_STDLIB_H)
|
|
# include <stdlib.h>
|
|
#else
|
|
# include "ansi_stdlib.h"
|
|
#endif /* HAVE_STDLIB_H */
|
|
|
|
#include "xmalloc.h"
|
|
|
|
/* **************************************************************** */
|
|
/* */
|
|
/* Memory Allocation and Deallocation. */
|
|
/* */
|
|
/* **************************************************************** */
|
|
|
|
static void
|
|
memory_error_and_abort(const char *fname)
|
|
{
|
|
fprintf (stderr, "%s: out of virtual memory\n", fname);
|
|
exit (2);
|
|
}
|
|
|
|
/* Return a pointer to free()able block of memory large enough
|
|
to hold BYTES number of bytes. If the memory cannot be allocated,
|
|
print an error message and abort. */
|
|
PTR_T
|
|
xmalloc (bytes)
|
|
size_t bytes;
|
|
{
|
|
PTR_T temp;
|
|
|
|
temp = malloc (bytes);
|
|
if (temp == 0)
|
|
memory_error_and_abort("xmalloc");
|
|
return (temp);
|
|
}
|
|
|
|
PTR_T
|
|
xrealloc (pointer, bytes)
|
|
PTR_T pointer;
|
|
size_t bytes;
|
|
{
|
|
PTR_T temp;
|
|
|
|
temp = pointer ? realloc (pointer, bytes) : malloc (bytes);
|
|
|
|
if (temp == 0)
|
|
memory_error_and_abort("xrealloc");
|
|
return (temp);
|
|
}
|
|
|
|
/* Use this as the function to call when adding unwind protects so we
|
|
don't need to know what free() returns. */
|
|
void
|
|
xfree (string)
|
|
PTR_T string;
|
|
{
|
|
if (string)
|
|
free (string);
|
|
}
|