Add _ to the beginning of all debug macros to avoid name collisions

This commit is contained in:
Gregory Nutt
2016-06-16 12:33:32 -06:00
parent fdaf3d7268
commit 0c8c7fecf0
252 changed files with 1348 additions and 1374 deletions
+2 -2
View File
@@ -228,7 +228,7 @@ static int bat_charger_ioctl(FAR struct file *filep, int cmd,
break;
default:
err("ERROR: Unrecognized cmd: %d\n", cmd);
_err("ERROR: Unrecognized cmd: %d\n", cmd);
ret = -ENOTTY;
break;
}
@@ -268,7 +268,7 @@ int battery_charger_register(FAR const char *devpath,
ret = register_driver(devpath, &g_batteryops, 0555, dev);
if (ret < 0)
{
err("ERROR: Failed to register driver: %d\n", ret);
_err("ERROR: Failed to register driver: %d\n", ret);
}
return ret;
+2 -2
View File
@@ -213,7 +213,7 @@ static int bat_gauge_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
break;
default:
err("ERROR: Unrecognized cmd: %d\n", cmd);
_err("ERROR: Unrecognized cmd: %d\n", cmd);
ret = -ENOTTY;
break;
}
@@ -253,7 +253,7 @@ int battery_gauge_register(FAR const char *devpath,
ret = register_driver(devpath, &g_batteryops, 0555, dev);
if (ret < 0)
{
err("ERROR: Failed to register driver: %d\n", ret);
_err("ERROR: Failed to register driver: %d\n", ret);
}
return ret;
+2 -2
View File
@@ -78,8 +78,8 @@
/* Debug ********************************************************************/
#ifdef CONFIG_DEBUG_BQ2425X
# define baterr err
# define batreg err
# define baterr _err
# define batreg _err
#else
# ifdef CONFIG_CPP_HAVE_VARARGS
# define baterr(x...)
+1 -1
View File
@@ -160,7 +160,7 @@
/* Debug ********************************************************************/
#ifdef CONFIG_DEBUG_MAX1704X
# define baterr err
# define baterr _err
#else
# ifdef CONFIG_CPP_HAVE_VARARGS
# define baterr(x...)