fix compile warning

proftpd · Apr 28, 2016 · ab4f890 · ab4f890
1 parent c57782b
commit ab4f890
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/include/log.h b/include/log.h
@@ -83,6 +83,10 @@
 # include <login.h>
 #endif
 
+#ifdef HAVE_EXECINFO_H
+# include <execinfo.h>
+#endif
+
 #ifdef HAVE_PATHS_H
 # include <paths.h>
 #endif
@@ -99,12 +103,13 @@
 # endif
 #endif
 
-void pr_log_stacktrace(module *module, int debuglevel, const char*file, int line);
 
 int log_lastlog(uid_t uid, const char *user_name, const char *tty,
   const pr_netaddr_t *remote_addr);
 #endif /* PR_USE_LASTLOG */
 
+void pr_log_stacktrace(module *module, int debuglevel, const char*file, int line);
+
 /* Note: Like lastlog.h, it would be tempting to split out the declaration of
  * this function, and its necessary system headers, into a proftpd-specific
  * wtmp.h file.  But that would collide with the system wtmp.h file on

diff --git a/src/log.c b/src/log.c
@@ -64,7 +64,7 @@ void pr_log_stacktrace(module *module, int debuglevel, const char*file, int line
   char **strings;
   int tracesz;
 
-  (void) pr_log_debug(debuglevel, "%s/%s: -----BEGIN STACK TRACE from %s/%d -----",module->name,module->module_version, function);
+  (void) pr_log_debug(debuglevel, "%s/%s: -----BEGIN STACK TRACE from %s/%d -----",module->name,module->module_version, file, line);
 
   tracesz = backtrace(trace, PR_TUNABLE_CALLER_DEPTH);
   if (tracesz < 0) {