Skip to content

Commit d19e48b

Browse files
swift-kimswift-kim
authored
Use get_error_message() whenever possible (#111)
* Update log.h * Use get_error_message() * Update log.h
1 parent e2e4d43 commit d19e48b

File tree

29 files changed

+225
-478
lines changed

29 files changed

+225
-478
lines changed

‎packages/audioplayers/tizen/src/log.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,13 @@
88
#endif
99
#define LOG_TAG "AudioplayersTizenPlugin"
1010

11-
#define LOG(prio, fmt, arg...) \
12-
dlog_print(prio, LOG_TAG, "%s: %s(%d) > " fmt, __FILE__, __func__, __LINE__, \
13-
##arg)
11+
#ifndef __MODULE__
12+
#define __MODULE__ strrchr("/" __FILE__, '/') + 1
13+
#endif
14+
15+
#define LOG(prio, fmt, arg...) \
16+
dlog_print(prio, LOG_TAG, "%s: %s(%d) > " fmt, __MODULE__, __func__, \
17+
__LINE__, ##arg)
1418

1519
#define LOG_DEBUG(fmt, args...) LOG(DLOG_DEBUG, fmt, ##args)
1620
#define LOG_INFO(fmt, args...) LOG(DLOG_INFO, fmt, ##args)

‎packages/battery/tizen/src/battery_tizen_plugin.cc

Lines changed: 6 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -18,29 +18,6 @@
1818

1919
#include "log.h"
2020

21-
static std::string DeviceErrorToString(int error) {
22-
switch (error) {
23-
case DEVICE_ERROR_NONE:
24-
return "Device - Successful";
25-
case DEVICE_ERROR_OPERATION_FAILED:
26-
return "Device - Operation not permitted";
27-
case DEVICE_ERROR_PERMISSION_DENIED:
28-
return "Device - Permission denied";
29-
case DEVICE_ERROR_INVALID_PARAMETER:
30-
return "Device - Invalid parameter";
31-
case DEVICE_ERROR_ALREADY_IN_PROGRESS:
32-
return "Device - Operation already in progress";
33-
case DEVICE_ERROR_NOT_SUPPORTED:
34-
return "Device - Not supported on this device";
35-
case DEVICE_ERROR_RESOURCE_BUSY:
36-
return "Device - Device or resource busy";
37-
case DEVICE_ERROR_NOT_INITIALIZED:
38-
return "Device - Not initialized";
39-
default:
40-
return "Device - Unknown Error";
41-
}
42-
}
43-
4421
class BatteryTizenPlugin : public flutter::Plugin {
4522
public:
4623
static void RegisterWithRegistrar(flutter::PluginRegistrar *registrar) {
@@ -105,14 +82,14 @@ class BatteryTizenPlugin : public flutter::Plugin {
10582
int ret = device_add_callback(DEVICE_CALLBACK_BATTERY_CHARGING,
10683
BatteryChangedCB, this);
10784
if (ret != DEVICE_ERROR_NONE) {
108-
m_events->Error("failed_to_add_callback", DeviceErrorToString(ret));
85+
m_events->Error("failed_to_add_callback", get_error_message(ret));
10986
return;
11087
}
11188

11289
ret = device_add_callback(DEVICE_CALLBACK_BATTERY_LEVEL, BatteryChangedCB,
11390
this);
11491
if (ret != DEVICE_ERROR_NONE) {
115-
m_events->Error("failed_to_add_callback", DeviceErrorToString(ret));
92+
m_events->Error("failed_to_add_callback", get_error_message(ret));
11693
return;
11794
}
11895

@@ -129,13 +106,13 @@ class BatteryTizenPlugin : public flutter::Plugin {
129106
BatteryChangedCB);
130107
if (ret != DEVICE_ERROR_NONE) {
131108
LOG_ERROR("Failed to run device_remove_callback (%d: %s)", ret,
132-
DeviceErrorToString(ret).c_str());
109+
get_error_message(ret));
133110
}
134111
ret =
135112
device_remove_callback(DEVICE_CALLBACK_BATTERY_LEVEL, BatteryChangedCB);
136113
if (ret != DEVICE_ERROR_NONE) {
137114
LOG_ERROR("Failed to run device_remove_callback (%d: %s)", ret,
138-
DeviceErrorToString(ret).c_str());
115+
get_error_message(ret));
139116
}
140117

141118
m_events = nullptr;
@@ -146,7 +123,7 @@ class BatteryTizenPlugin : public flutter::Plugin {
146123
int ret = device_battery_get_status(&status);
147124
if (ret != DEVICE_ERROR_NONE) {
148125
LOG_ERROR("Failed to run device_battery_get_status (%d: %s)", ret,
149-
DeviceErrorToString(ret).c_str());
126+
get_error_message(ret));
150127
return "";
151128
}
152129

@@ -209,7 +186,7 @@ class BatteryTizenPlugin : public flutter::Plugin {
209186
int ret, percentage;
210187
ret = device_battery_get_percent(&percentage);
211188
if (ret != DEVICE_ERROR_NONE) {
212-
result->Error("failed_to_get_percentage", DeviceErrorToString(ret));
189+
result->Error("failed_to_get_percentage", get_error_message(ret));
213190
}
214191
LOG_INFO("battery percentage [%d]", percentage);
215192
result->Success(flutter::EncodableValue(percentage));

‎packages/battery/tizen/src/log.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,13 @@
88
#endif
99
#define LOG_TAG "BatteryTizenPlugin"
1010

11-
#define LOG(prio, fmt, arg...) \
12-
dlog_print(prio, LOG_TAG, "%s: %s(%d) > " fmt, __FILE__, __func__, __LINE__, \
13-
##arg)
11+
#ifndef __MODULE__
12+
#define __MODULE__ strrchr("/" __FILE__, '/') + 1
13+
#endif
14+
15+
#define LOG(prio, fmt, arg...) \
16+
dlog_print(prio, LOG_TAG, "%s: %s(%d) > " fmt, __MODULE__, __func__, \
17+
__LINE__, ##arg)
1418

1519
#define LOG_DEBUG(fmt, args...) LOG(DLOG_DEBUG, fmt, ##args)
1620
#define LOG_INFO(fmt, args...) LOG(DLOG_INFO, fmt, ##args)

‎packages/camera/tizen/src/log.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
#define LOG_TAG "CameraPlugin"
1010

1111
#ifndef __MODULE__
12-
#define __MODULE__ \
13-
(strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__)
12+
#define __MODULE__ strrchr("/" __FILE__, '/') + 1
1413
#endif
1514

1615
#define LOG(prio, fmt, arg...) \

‎packages/connectivity/tizen/src/log.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,13 @@
88
#endif
99
#define LOG_TAG "ConnectivityTizenPlugin"
1010

11-
#define LOG(prio, fmt, arg...) \
12-
dlog_print(prio, LOG_TAG, "%s: %s(%d) > " fmt, __FILE__, __func__, __LINE__, \
13-
##arg)
11+
#ifndef __MODULE__
12+
#define __MODULE__ strrchr("/" __FILE__, '/') + 1
13+
#endif
14+
15+
#define LOG(prio, fmt, arg...) \
16+
dlog_print(prio, LOG_TAG, "%s: %s(%d) > " fmt, __MODULE__, __func__, \
17+
__LINE__, ##arg)
1418

1519
#define LOG_DEBUG(fmt, args...) LOG(DLOG_DEBUG, fmt, ##args)
1620
#define LOG_INFO(fmt, args...) LOG(DLOG_INFO, fmt, ##args)

‎packages/device_info/tizen/src/device_info_tizen_plugin.cc

Lines changed: 14 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,6 @@
1919

2020
#include "log.h"
2121

22-
static std::string systemInfoErrorToString(int error) {
23-
switch (error) {
24-
case SYSTEM_INFO_ERROR_NONE:
25-
return "SystemInfo - Successful";
26-
case SYSTEM_INFO_ERROR_INVALID_PARAMETER:
27-
return "SystemInfo - Invalid parameter";
28-
case SYSTEM_INFO_ERROR_OUT_OF_MEMORY:
29-
return "SystemInfo - Out of Memory";
30-
case SYSTEM_INFO_ERROR_IO_ERROR:
31-
return "SystemInfo - IO Error";
32-
case SYSTEM_INFO_ERROR_PERMISSION_DENIED:
33-
return "SystemInfo - Permission denied";
34-
default:
35-
return "SystemInfo - Unknown Error";
36-
}
37-
}
38-
3922
class DeviceInfoTizenPlugin : public flutter::Plugin {
4023
public:
4124
static void RegisterWithRegistrar(flutter::PluginRegistrar *registrar) {
@@ -75,7 +58,7 @@ class DeviceInfoTizenPlugin : public flutter::Plugin {
7558
ret = system_info_get_platform_string("http://tizen.org/system/model_name",
7659
&value);
7760
if (ret != SYSTEM_INFO_ERROR_NONE) {
78-
resultStr = systemInfoErrorToString(ret);
61+
resultStr = get_error_message(ret);
7962
errorStr.append(" Failed to get model name: ");
8063
errorStr.append(resultStr);
8164
} else {
@@ -91,7 +74,7 @@ class DeviceInfoTizenPlugin : public flutter::Plugin {
9174
ret = system_info_get_platform_string(
9275
"http://tizen.org/feature/platform.core.cpu.arch", &value);
9376
if (ret != SYSTEM_INFO_ERROR_NONE) {
94-
resultStr = systemInfoErrorToString(ret);
77+
resultStr = get_error_message(ret);
9578
errorStr.append(" Failed to get cpu arch: ");
9679
errorStr.append(resultStr);
9780
} else {
@@ -107,7 +90,7 @@ class DeviceInfoTizenPlugin : public flutter::Plugin {
10790
ret = system_info_get_platform_string(
10891
"http://tizen.org/feature/platform.native.api.version", &value);
10992
if (ret != SYSTEM_INFO_ERROR_NONE) {
110-
resultStr = systemInfoErrorToString(ret);
93+
resultStr = get_error_message(ret);
11194
errorStr.append(" Failed to get native api version: ");
11295
errorStr.append(resultStr);
11396
} else {
@@ -123,7 +106,7 @@ class DeviceInfoTizenPlugin : public flutter::Plugin {
123106
ret = system_info_get_platform_string(
124107
"http://tizen.org/feature/platform.version", &value);
125108
if (ret != SYSTEM_INFO_ERROR_NONE) {
126-
resultStr = systemInfoErrorToString(ret);
109+
resultStr = get_error_message(ret);
127110
errorStr.append(" Failed to get platform version: ");
128111
errorStr.append(resultStr);
129112
} else {
@@ -139,7 +122,7 @@ class DeviceInfoTizenPlugin : public flutter::Plugin {
139122
ret = system_info_get_platform_string(
140123
"http://tizen.org/feature/platform.web.api.version", &value);
141124
if (ret != SYSTEM_INFO_ERROR_NONE) {
142-
resultStr = systemInfoErrorToString(ret);
125+
resultStr = get_error_message(ret);
143126
errorStr.append(" Failed to get web api version: ");
144127
errorStr.append(resultStr);
145128
} else {
@@ -155,7 +138,7 @@ class DeviceInfoTizenPlugin : public flutter::Plugin {
155138
ret = system_info_get_platform_string("http://tizen.org/system/build.date",
156139
&value);
157140
if (ret != SYSTEM_INFO_ERROR_NONE) {
158-
resultStr = systemInfoErrorToString(ret);
141+
resultStr = get_error_message(ret);
159142
errorStr.append(" Failed to get build date: ");
160143
errorStr.append(resultStr);
161144
} else {
@@ -171,7 +154,7 @@ class DeviceInfoTizenPlugin : public flutter::Plugin {
171154
ret = system_info_get_platform_string("http://tizen.org/system/build.id",
172155
&value);
173156
if (ret != SYSTEM_INFO_ERROR_NONE) {
174-
resultStr = systemInfoErrorToString(ret);
157+
resultStr = get_error_message(ret);
175158
errorStr.append(" Failed to get build id: ");
176159
errorStr.append(resultStr);
177160
} else {
@@ -187,7 +170,7 @@ class DeviceInfoTizenPlugin : public flutter::Plugin {
187170
ret = system_info_get_platform_string(
188171
"http://tizen.org/system/build.string", &value);
189172
if (ret != SYSTEM_INFO_ERROR_NONE) {
190-
resultStr = systemInfoErrorToString(ret);
173+
resultStr = get_error_message(ret);
191174
errorStr.append(" Failed to get build string: ");
192175
errorStr.append(resultStr);
193176
} else {
@@ -203,7 +186,7 @@ class DeviceInfoTizenPlugin : public flutter::Plugin {
203186
ret = system_info_get_platform_string("http://tizen.org/system/build.time",
204187
&value);
205188
if (ret != SYSTEM_INFO_ERROR_NONE) {
206-
resultStr = systemInfoErrorToString(ret);
189+
resultStr = get_error_message(ret);
207190
errorStr.append(" Failed to get build time: ");
208191
errorStr.append(resultStr);
209192
} else {
@@ -219,7 +202,7 @@ class DeviceInfoTizenPlugin : public flutter::Plugin {
219202
ret = system_info_get_platform_string("http://tizen.org/system/build.type",
220203
&value);
221204
if (ret != SYSTEM_INFO_ERROR_NONE) {
222-
resultStr = systemInfoErrorToString(ret);
205+
resultStr = get_error_message(ret);
223206
errorStr.append(" Failed to get build type: ");
224207
errorStr.append(resultStr);
225208
} else {
@@ -235,7 +218,7 @@ class DeviceInfoTizenPlugin : public flutter::Plugin {
235218
ret = system_info_get_platform_string(
236219
"http://tizen.org/system/build.variant", &value);
237220
if (ret != SYSTEM_INFO_ERROR_NONE) {
238-
resultStr = systemInfoErrorToString(ret);
221+
resultStr = get_error_message(ret);
239222
errorStr.append(" Failed to get build variant: ");
240223
errorStr.append(resultStr);
241224
} else {
@@ -251,7 +234,7 @@ class DeviceInfoTizenPlugin : public flutter::Plugin {
251234
ret = system_info_get_platform_string(
252235
"http://tizen.org/system/build.release", &value);
253236
if (ret != SYSTEM_INFO_ERROR_NONE) {
254-
resultStr = systemInfoErrorToString(ret);
237+
resultStr = get_error_message(ret);
255238
errorStr.append(" Failed to get build release: ");
256239
errorStr.append(resultStr);
257240
} else {
@@ -267,7 +250,7 @@ class DeviceInfoTizenPlugin : public flutter::Plugin {
267250
ret = system_info_get_platform_string("http://tizen.org/system/device_type",
268251
&value);
269252
if (ret != SYSTEM_INFO_ERROR_NONE) {
270-
resultStr = systemInfoErrorToString(ret);
253+
resultStr = get_error_message(ret);
271254
errorStr.append(" Failed to get device type: ");
272255
errorStr.append(resultStr);
273256
} else {
@@ -283,7 +266,7 @@ class DeviceInfoTizenPlugin : public flutter::Plugin {
283266
ret = system_info_get_platform_string(
284267
"http://tizen.org/system/manufacturer", &value);
285268
if (ret != SYSTEM_INFO_ERROR_NONE) {
286-
resultStr = systemInfoErrorToString(ret);
269+
resultStr = get_error_message(ret);
287270
errorStr.append(" Failed to get manufacturer: ");
288271
errorStr.append(resultStr);
289272
} else {

‎packages/device_info/tizen/src/log.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,13 @@
88
#endif
99
#define LOG_TAG "DeviceInfoTizenPlugin"
1010

11-
#define LOG(prio, fmt, arg...) \
12-
dlog_print(prio, LOG_TAG, "%s: %s(%d) > " fmt, __FILE__, __func__, __LINE__, \
13-
##arg)
11+
#ifndef __MODULE__
12+
#define __MODULE__ strrchr("/" __FILE__, '/') + 1
13+
#endif
14+
15+
#define LOG(prio, fmt, arg...) \
16+
dlog_print(prio, LOG_TAG, "%s: %s(%d) > " fmt, __MODULE__, __func__, \
17+
__LINE__, ##arg)
1418

1519
#define LOG_DEBUG(fmt, args...) LOG(DLOG_DEBUG, fmt, ##args)
1620
#define LOG_INFO(fmt, args...) LOG(DLOG_INFO, fmt, ##args)

0 commit comments

Comments
 (0)