@@ -42,19 +42,15 @@ CHIP_ERROR GenericDeviceInstanceInfoProvider<ConfigClass>::GetVendorName(char *
42
42
size_t vendorNameLen = 0 ; // without counting null-terminator
43
43
44
44
err = mGenericConfigManager .ReadConfigValueStr (ConfigClass::kConfigKey_VendorName , buf, bufSize, vendorNameLen);
45
- # ifdef CHIP_DEVICE_CONFIG_DEVICE_VENDOR_NAME
46
- if (CHIP_DEVICE_CONFIG_DEVICE_VENDOR_NAME[ 0 ] != 0 && err == CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND)
45
+
46
+ if (err == CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND)
47
47
{
48
48
ReturnErrorCodeIf (bufSize < sizeof (CHIP_DEVICE_CONFIG_DEVICE_VENDOR_NAME), CHIP_ERROR_BUFFER_TOO_SMALL);
49
49
memcpy (buf, CHIP_DEVICE_CONFIG_DEVICE_VENDOR_NAME, sizeof (CHIP_DEVICE_CONFIG_DEVICE_VENDOR_NAME));
50
- vendorNameLen = sizeof (CHIP_DEVICE_CONFIG_DEVICE_VENDOR_NAME) - 1 ;
51
- err = CHIP_NO_ERROR;
50
+ err = CHIP_NO_ERROR;
52
51
}
53
- #endif
54
- ReturnErrorOnFailure (err);
55
52
56
- ReturnErrorCodeIf (vendorNameLen >= bufSize, CHIP_ERROR_BUFFER_TOO_SMALL);
57
- ReturnErrorCodeIf (buf[vendorNameLen] != 0 , CHIP_ERROR_INVALID_STRING_LENGTH);
53
+ VerifyOrReturnError (err == CHIP_NO_ERROR, CHIP_ERROR_INTERNAL);
58
54
59
55
return err;
60
56
}
@@ -67,19 +63,14 @@ CHIP_ERROR GenericDeviceInstanceInfoProvider<ConfigClass>::GetProductName(char *
67
63
68
64
err = mGenericConfigManager .ReadConfigValueStr (ConfigClass::kConfigKey_ProductName , buf, bufSize, productNameLen);
69
65
70
- #ifdef CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_NAME
71
- if (CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_NAME[0 ] != 0 && err == CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND)
66
+ if (err == CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND)
72
67
{
73
68
ReturnErrorCodeIf (bufSize < sizeof (CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_NAME), CHIP_ERROR_BUFFER_TOO_SMALL);
74
69
memcpy (buf, CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_NAME, sizeof (CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_NAME));
75
- productNameLen = sizeof (CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_NAME) - 1 ;
76
- err = CHIP_NO_ERROR;
70
+ err = CHIP_NO_ERROR;
77
71
}
78
- #endif
79
- ReturnErrorOnFailure (err);
80
72
81
- ReturnErrorCodeIf (productNameLen >= bufSize, CHIP_ERROR_BUFFER_TOO_SMALL);
82
- ReturnErrorCodeIf (buf[productNameLen] != 0 , CHIP_ERROR_INVALID_STRING_LENGTH);
73
+ VerifyOrReturnError (err == CHIP_NO_ERROR, CHIP_ERROR_INTERNAL);
83
74
84
75
return err;
85
76
}
@@ -128,19 +119,15 @@ CHIP_ERROR GenericDeviceInstanceInfoProvider<ConfigClass>::GetSerialNumber(char
128
119
129
120
err = mGenericConfigManager .ReadConfigValueStr (ConfigClass::kConfigKey_SerialNum , buf, bufSize, serialNumLen);
130
121
131
- #ifdef CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER
132
- if (CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER[0 ] != 0 && err == CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND)
122
+ if (err == CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND)
133
123
{
134
124
ReturnErrorCodeIf (sizeof (CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER) > bufSize, CHIP_ERROR_BUFFER_TOO_SMALL);
135
125
memcpy (buf, CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER, sizeof (CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER));
136
- serialNumLen = sizeof (CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER) - 1 ;
137
- err = CHIP_NO_ERROR;
126
+
127
+ err = CHIP_NO_ERROR;
138
128
}
139
- #endif // CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER
140
- ReturnErrorOnFailure (err);
141
129
142
- ReturnErrorCodeIf (serialNumLen >= bufSize, CHIP_ERROR_BUFFER_TOO_SMALL);
143
- ReturnErrorCodeIf (buf[serialNumLen] != 0 , CHIP_ERROR_INVALID_STRING_LENGTH);
130
+ VerifyOrReturnError (err == CHIP_NO_ERROR, CHIP_ERROR_INTERNAL);
144
131
145
132
return err;
146
133
}
@@ -214,20 +201,15 @@ CHIP_ERROR GenericDeviceInstanceInfoProvider<ConfigClass>::GetHardwareVersionStr
214
201
err = mGenericConfigManager .ReadConfigValueStr (ConfigClass::kConfigKey_HardwareVersionString , buf, bufSize,
215
202
hardwareVersionStringLen);
216
203
217
- #ifdef CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION_STRING
218
- if (CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION_STRING[0 ] != 0 && err == CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND)
204
+ if (err == CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND)
219
205
{
220
206
ReturnErrorCodeIf (bufSize < sizeof (CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION_STRING), CHIP_ERROR_BUFFER_TOO_SMALL);
221
207
memcpy (buf, CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION_STRING,
222
208
sizeof (CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION_STRING));
223
- hardwareVersionStringLen = sizeof (CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION_STRING) - 1 ;
224
- err = CHIP_NO_ERROR;
209
+ err = CHIP_NO_ERROR;
225
210
}
226
- #endif
227
- ReturnErrorOnFailure (err);
228
211
229
- ReturnErrorCodeIf (hardwareVersionStringLen >= bufSize, CHIP_ERROR_BUFFER_TOO_SMALL);
230
- ReturnErrorCodeIf (buf[hardwareVersionStringLen] != 0 , CHIP_ERROR_INVALID_STRING_LENGTH);
212
+ VerifyOrReturnError (err == CHIP_NO_ERROR, CHIP_ERROR_INTERNAL);
231
213
232
214
return err;
233
215
}
0 commit comments