libisc/assertions.c

@@ -79,7 +79,7 @@ isc_assertion_typetotext(isc_assertiontype_t type) {
 		result = "INVARIANT";
 		break;
 	default:
-		result = NULL;
+		result = "(null)";
 	}
 	return (result);
 }
@@ -95,7 +95,6 @@ default_callback(const char *file, int line, isc_assertiontype_t type,
 	void *tracebuf[BACKTRACE_MAXFRAME];
 	int i, nframes = 0;
 	const char *logsuffix = ".";
-	const char *fname;
 	isc_result_t result;
 
 	result = isc_backtrace_gettrace(tracebuf, BACKTRACE_MAXFRAME, &nframes);
@@ -106,11 +105,7 @@ default_callback(const char *file, int line, isc_assertiontype_t type,
 		file, line, isc_assertion_typetotext(type), cond, logsuffix);
 	if (result == ISC_R_SUCCESS) {
 		for (i = 0; i < nframes; i++) {
-			unsigned long offset;
-
-			fname = NULL;
-			fprintf(stderr, "#%d %p in ??\n", i,
-				tracebuf[i]);
+			fprintf(stderr, "#%d %p in ??\n", i, tracebuf[i]);
 		}
 	}
 	fflush(stderr);

libisc/backtrace.c

@@ -18,17 +18,6 @@
 #include "isc/result.h"
 #include "isc/util.h"
 
-/*
- * Define empty (default) symbol table used in backtrace.c
- * If the application wants to have a complete symbol table, it should redefine
- * isc__backtrace_symtable with the complete table in some way, and link the
- * version of the library not including this definition
- * (e.g. libisc-nosymbol.a).
- */
-
-static const int isc__backtrace_nsymbols = 0;
-static const isc_backtrace_symmap_t isc__backtrace_symtable[] = { { NULL, "" } };
-
 #ifdef ISC_PLATFORM_USEBACKTRACE
 /*
  * Getting a back trace of a running process is tricky and highly platform