浏览代码

logtrace: cleanup code and fix compiling warnings

Grissiom 12 年之前
父节点
当前提交
783a6a6717
共有 2 个文件被更改,包括 4 次插入4 次删除
  1. 2 2
      components/utilities/logtrace/log_trace.c
  2. 2 2
      components/utilities/logtrace/log_trace.h

+ 2 - 2
components/utilities/logtrace/log_trace.c

@@ -41,7 +41,7 @@ static struct rt_device _log_device;
 static rt_device_t _traceout_device = RT_NULL;
 
 /* define a default lg session. The name is empty. */
-static struct log_trace_session _def_session = {{0}, LOG_TRACE_LEVEL_INFO};
+static struct log_trace_session _def_session = {{"\0"}, LOG_TRACE_LEVEL_INFO};
 static struct log_trace_session *_the_sessions[LOG_TRACE_MAX_SESSION] = {&_def_session};
 /* there is a default session at least */
 static rt_uint16_t _the_sess_nr = 1;
@@ -272,7 +272,7 @@ static void _lg_fmtout(
 
     _trace_buf[0] = ']';
     ptr = &_trace_buf[1];
-    length = vsnprintf(ptr, LOG_TRACE_BUFSZ, fmt, argptr);
+    length = rt_vsnprintf(ptr, LOG_TRACE_BUFSZ, fmt, argptr);
 
     if (length >= LOG_TRACE_BUFSZ)
         length = LOG_TRACE_BUFSZ - 1;

+ 2 - 2
components/utilities/logtrace/log_trace.h

@@ -140,12 +140,12 @@ rt_err_t log_trace_set_device(const char *device_name);
 
 void log_trace_flush(void);
 
+#ifdef RT_USING_DFS
 /** set the backend to file */
 void log_trace_set_file(const char *filename);
 
-/* log trace for NAND Flash */
-void log_trace_nand_init(const char *nand_device);
 void log_trace_file_init(const char *filename);
+#endif /* RT_USING_DFS */
 
 #endif