Drop use of two deprecated defines 41/23941/1
authorMats Wichmann <mats@linux.com>
Mon, 15 Jan 2018 15:08:15 +0000 (08:08 -0700)
committerMats Wichmann <mats@linux.com>
Mon, 15 Jan 2018 15:08:15 +0000 (08:08 -0700)
Per the header ocstackconfig.h, two defines are
deprecated with replacement. Change the single file
which still uses the old names.  The header comment:

/**
 * Maximum length of the Manufacturer name supported by the server
 * for manufacturer name.
 * @deprecated use MAX_PLATFORM_NAME_LENGTH instead.
 */

/**
 * Maximum length of the URL to the Manufacturer details supported by
 * the server.
 * @deprecated use MAX_PLATFORM_URL_LENGTH instead.
 */

Change-Id: I40ae198120de175750447996ebd43bed9ec25fa8
Signed-off-by: Mats Wichmann <mats@linux.com>
bridging/common/pluginServer.cpp

index 7af1597..0b15c10 100644 (file)
@@ -224,13 +224,13 @@ HandleError :
 
 static MPMResult setPlatformInfoParams(OCPlatformInfo &platform_info)
 {
-    if ((strlen(g_manufacturer_name) > MAX_MANUFACTURER_NAME_LENGTH))
+    if ((strlen(g_manufacturer_name) > MAX_PLATFORM_NAME_LENGTH))
     {
         OIC_LOG(ERROR, TAG, "Manufacture name string length exceeded max length");
         return MPM_RESULT_INTERNAL_ERROR;
     }
 
-    if (g_manufacturer_url != NULL && (strlen(g_manufacturer_url) > MAX_MANUFACTURER_URL_LENGTH))
+    if (g_manufacturer_url != NULL && (strlen(g_manufacturer_url) > MAX_PLATFORM_URL_LENGTH))
     {
         OIC_LOG(ERROR, TAG, "Url string length exceeded max length");
         return MPM_RESULT_INTERNAL_ERROR;