summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-03-23 10:22:15 +1100
committerAndrew Tridgell <tridge@samba.org>2011-03-23 11:03:57 +1100
commitcb2cc34effedca2af4e9f6d57303ccc779a9cc04 (patch)
treed0e8b07764c3d1cfa38781543aae07aa92c746f7
parentcfae1e795f56add279d5ea24e3410d376ae908d2 (diff)
downloadsamba-cb2cc34effedca2af4e9f6d57303ccc779a9cc04.tar.gz
samba-cb2cc34effedca2af4e9f6d57303ccc779a9cc04.tar.bz2
samba-cb2cc34effedca2af4e9f6d57303ccc779a9cc04.zip
fault: rename fault.c to fault_s4.c
this is in preparation for merging the s3 fault code into common
-rw-r--r--lib/util/fault_s4.c (renamed from lib/util/fault.c)20
-rwxr-xr-xlib/util/wscript_build2
2 files changed, 11 insertions, 11 deletions
diff --git a/lib/util/fault.c b/lib/util/fault_s4.c
index 29b45ee147..0f902b4f84 100644
--- a/lib/util/fault.c
+++ b/lib/util/fault_s4.c
@@ -1,18 +1,18 @@
-/*
+/*
Unix SMB/CIFS implementation.
Critical Fault handling
Copyright (C) Andrew Tridgell 1992-1998
-
+
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 3 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, see <http://www.gnu.org/licenses/>.
*/
@@ -58,9 +58,9 @@ _PUBLIC_ void call_backtrace(void)
backtrace_size = backtrace(backtrace_stack,BACKTRACE_STACK_SIZE);
backtrace_strings = backtrace_symbols(backtrace_stack, backtrace_size);
- DEBUG(0, ("BACKTRACE: %lu stack frames:\n",
+ DEBUG(0, ("BACKTRACE: %lu stack frames:\n",
(unsigned long)backtrace_size));
-
+
if (backtrace_strings) {
int i;
@@ -156,7 +156,7 @@ report a fault
_NORETURN_ static void fault_report(int sig)
{
static int counter;
-
+
if (counter) _exit(1);
DEBUG(0,("=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n"));
@@ -215,15 +215,15 @@ _PUBLIC_ void fault_setup_disable(void)
/**
- register a fault handler.
+ register a fault handler.
Should only be called once in the execution of smbd.
*/
-_PUBLIC_ bool register_fault_handler(const char *name,
+_PUBLIC_ bool register_fault_handler(const char *name,
void (*fault_handler)(int sig))
{
if (fault_handlers.name != NULL) {
/* it's already registered! */
- DEBUG(2,("fault handler '%s' already registered - failed '%s'\n",
+ DEBUG(2,("fault handler '%s' already registered - failed '%s'\n",
fault_handlers.name, name));
return false;
}
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index 7c18075faa..8cbb8bb893 100755
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -20,7 +20,7 @@ bld.SAMBA_LIBRARY('samba-util-common',
if bld.env._SAMBA_BUILD_ == 4:
bld.SAMBA_LIBRARY('samba-util',
- source='''dprintf.c fault.c data_blob.c
+ source='''dprintf.c fault_s4.c data_blob.c
ms_fnmatch.c parmlist.c substitute.c util_str.c
''',
deps='samba-util-common',