more cleansing on DBG macro

Because espmissingincludes.h contains a properly escaped definition
for os_printf() macro, we can simplify the DBG definition.
pull/95/head
susisstrolch 9 years ago
parent 57011de179
commit 5fd831a27c
  1. 2
      cmd/cmd.c
  2. 2
      cmd/handlers.c
  3. 2
      esp-link/cgi.c
  4. 2
      esp-link/cgiflash.c
  5. 2
      esp-link/cgimqtt.c
  6. 2
      esp-link/cgioptiboot.c
  7. 2
      esp-link/cgiservices.c
  8. 2
      esp-link/cgiwifi.c
  9. 2
      esp-link/log.c
  10. 2
      esp-link/mqtt_client.c
  11. 2
      httpd/httpd.c
  12. 2
      mqtt/mqtt_cmd.c
  13. 2
      serial/slip.c
  14. 2
      syslog/syslog.c
  15. 2
      user/user_main.c

@ -8,7 +8,7 @@
#include "uart.h" #include "uart.h"
#ifdef CMD_DBG #ifdef CMD_DBG
#define DBG(format, ...) do { os_printf(format, ## __VA_ARGS__); } while(0) #define DBG(format, ...) os_printf(format, ## __VA_ARGS__)
static const char *cmd_names[] = { static const char *cmd_names[] = {
"NULL", "RESET", "IS_READY", "WIFI_CONNECT", "NULL", "RESET", "IS_READY", "WIFI_CONNECT",
"MQTT_SETUP", "MQTT_CONNECT", "MQTT_DISCONNECT", "MQTT_SETUP", "MQTT_CONNECT", "MQTT_DISCONNECT",

@ -13,7 +13,7 @@
#endif #endif
#ifdef CMD_DBG #ifdef CMD_DBG
#define DBG(format, ...) do { os_printf(format, ## __VA_ARGS__); } while(0) #define DBG(format, ...) os_printf(format, ## __VA_ARGS__)
#else #else
#define DBG(format, ...) do { } while(0) #define DBG(format, ...) do { } while(0)
#endif #endif

@ -18,7 +18,7 @@ Some random cgi routines.
#include "config.h" #include "config.h"
#ifdef CGI_DBG #ifdef CGI_DBG
#define DBG(format, ...) do { os_printf(format, ## __VA_ARGS__); } while(0) #define DBG(format, ...) os_printf(format, ## __VA_ARGS__)
#else #else
#define DBG(format, ...) do { } while(0) #define DBG(format, ...) do { } while(0)
#endif #endif

@ -20,7 +20,7 @@ Some flash handling cgi routines. Used for reading the existing flash and updati
#include "cgiflash.h" #include "cgiflash.h"
#ifdef CGIFLASH_DBG #ifdef CGIFLASH_DBG
#define DBG(format, ...) do { os_printf(format, ## __VA_ARGS__); } while(0) #define DBG(format, ...) os_printf(format, ## __VA_ARGS__)
#else #else
#define DBG(format, ...) do { } while(0) #define DBG(format, ...) do { } while(0)
#endif #endif

@ -17,7 +17,7 @@ char *mqttState(void) {
#include "cgimqtt.h" #include "cgimqtt.h"
#ifdef CGIMQTT_DBG #ifdef CGIMQTT_DBG
#define DBG(format, ...) do { os_printf(format, ## __VA_ARGS__); } while(0) #define DBG(format, ...) os_printf(format, ## __VA_ARGS__)
#else #else
#define DBG(format, ...) do { } while(0) #define DBG(format, ...) do { } while(0)
#endif #endif

@ -17,7 +17,7 @@
#define PGM_INTERVAL 200 // send sync at this interval in ms when in programming mode #define PGM_INTERVAL 200 // send sync at this interval in ms when in programming mode
#ifdef OPTIBOOT_DBG #ifdef OPTIBOOT_DBG
#define DBG(format, ...) do { os_printf(format, ## __VA_ARGS__); } while(0) #define DBG(format, ...) os_printf(format, ## __VA_ARGS__)
#else #else
#define DBG(format, ...) do { } while(0) #define DBG(format, ...) do { } while(0)
#endif #endif

@ -7,7 +7,7 @@
#include "cgimqtt.h" #include "cgimqtt.h"
#ifdef CGISERVICES_DBG #ifdef CGISERVICES_DBG
#define DBG(format, ...) do { os_printf(format, ## __VA_ARGS__); } while(0) #define DBG(format, ...) os_printf(format, ## __VA_ARGS__)
#else #else
#define DBG(format, ...) do { } while(0) #define DBG(format, ...) do { } while(0)
#endif #endif

@ -22,7 +22,7 @@ Cgi/template routines for the /wifi url.
#include "syslog.h" #include "syslog.h"
#ifdef CGIWIFI_DBG #ifdef CGIWIFI_DBG
#define DBG(format, ...) do { os_printf(format, ## __VA_ARGS__); } while(0) #define DBG(format, ...) os_printf(format, ## __VA_ARGS__)
#else #else
#define DBG(format, ...) do { } while(0) #define DBG(format, ...) do { } while(0)
#endif #endif

@ -7,7 +7,7 @@
#include "log.h" #include "log.h"
#ifdef LOG_DBG #ifdef LOG_DBG
#define DBG(format, ...) do { os_printf(format, ## __VA_ARGS__); } while(0) #define DBG(format, ...) os_printf(format, ## __VA_ARGS__)
#else #else
#define DBG(format, ...) do { } while(0) #define DBG(format, ...) do { } while(0)
#endif #endif

@ -5,7 +5,7 @@
#include "mqtt.h" #include "mqtt.h"
#ifdef MQTTCLIENT_DBG #ifdef MQTTCLIENT_DBG
#define DBG(format, ...) do { os_printf(format, ## __VA_ARGS__) } while(0) #define DBG(format, ...) os_printf(format, ## __VA_ARGS__)
#else #else
#define DBG(format, ...) do { } while(0) #define DBG(format, ...) do { } while(0)
#endif #endif

@ -18,7 +18,7 @@ Esp8266 http server - core routines
#include "httpd.h" #include "httpd.h"
#ifdef HTTPD_DBG #ifdef HTTPD_DBG
#define DBG(format, ...) do { os_printf(format, ## __VA_ARGS__); } while(0) #define DBG(format, ...)os_printf(format, ## __VA_ARGS__)
#else #else
#define DBG(format, ...) do { } while(0) #define DBG(format, ...) do { } while(0)
#endif #endif

@ -8,7 +8,7 @@
#include "mqtt_cmd.h" #include "mqtt_cmd.h"
#ifdef MQTTCMD_DBG #ifdef MQTTCMD_DBG
#define DBG(format, ...) do { os_printf(format, ## __VA_ARGS__); } while(0) #define DBG(format, ...) os_printf(format, ## __VA_ARGS__)
#else #else
#define DBG(format, ...) do { } while(0) #define DBG(format, ...) do { } while(0)
#endif #endif

@ -8,7 +8,7 @@
#include "cmd.h" #include "cmd.h"
#ifdef SLIP_DBG #ifdef SLIP_DBG
#define DBG(format, ...) do { os_printf(format, ## __VA_ARGS__); } while(0) #define DBG(format, ...) os_printf(format, ## __VA_ARGS__)
#else #else
#define DBG(format, ...) do { } while(0) #define DBG(format, ...) do { } while(0)
#endif #endif

@ -17,7 +17,7 @@
extern void * mem_trim(void *m, size_t s); // not well documented... extern void * mem_trim(void *m, size_t s); // not well documented...
#ifdef SYSLOG_DBG #ifdef SYSLOG_DBG
#define DBG(format, ...) do { os_printf(format, ## __VA_ARGS__); } while(0) #define DBG(format, ...) os_printf(format, ## __VA_ARGS__)
#else #else
#define DBG(format, ...) do { } while(0) #define DBG(format, ...) do { } while(0)
#endif #endif

@ -4,7 +4,7 @@
#define APPINIT_DBG #define APPINIT_DBG
#ifdef APPINIT_DBG #ifdef APPINIT_DBG
#define DBG(format, ...) do { os_printf(format, ## __VA_ARGS__); } while(0) #define DBG(format, ...) os_printf(format, ## __VA_ARGS__)
#else #else
#define DBG(format, ...) do { } while(0) #define DBG(format, ...) do { } while(0)
#endif #endif

Loading…
Cancel
Save