[OpenSM] - fix error messages to match linux trunk.

git-svn-id: svn://openib.tc.cornell.edu/gen1@235 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/trunk/ulp/opensm/user/opensm/osm_db_files.c b/trunk/ulp/opensm/user/opensm/osm_db_files.c
index 917c3451af909e7d61ea0e4f429a9493fd3e01dc..8527a57ee90896b38267d0becb6297bbdd321fba 100644 (file)
--- a/trunk/ulp/opensm/user/opensm/osm_db_files.c
+++ b/trunk/ulp/opensm/user/opensm/osm_db_files.c
@@ -61,16 +61,16 @@
 #define OSM_DB_MAX_LINE_LEN 1024
 /**********/
 
-/****d* Database/OSM_DB_MAX_WORD_LEN
+/****d* Database/OSM_DB_MAX_GUID_LEN
  * NAME
- * OSM_DB_MAX_WORD_LEN
+ * OSM_DB_MAX_GUID_LEN
  *
  * DESCRIPTION
  * The Maximal word length allowed for the file (guid or lid)
  *
  * SYNOPSIS
  */
-#define OSM_DB_MAX_WORD_LEN 32
+#define OSM_DB_MAX_GUID_LEN 32
 /**********/
 
 /****s* OpenSM: Database/osm_db_domain_imp
@@ -344,12 +344,12 @@ osm_db_restore(
         {
           osm_log( p_log, OSM_LOG_ERROR,
                    "osm_db_restore: ERR 6104: "
-                   " Fail to get key from line:%u : %s (file:%s)\n",
+                   " Failed to get key from line:%u : %s (file:%s)\n",
                    line_num, sLine, p_domain_imp->file_name);
           status = 1;
           goto EndParsing;
         }
-        if (strlen(p_first_word) > OSM_DB_MAX_WORD_LEN)
+        if (strlen(p_first_word) > OSM_DB_MAX_GUID_LEN)
         {
           osm_log( p_log, OSM_LOG_ERROR,
                    "osm_db_restore: ERR 610A: "
@@ -365,15 +365,6 @@ osm_db_restore(
         p_rest_of_line = strtok_r(NULL, "\n", &p_last);
         if (p_rest_of_line != NULL)
         {
-          if (strlen(p_rest_of_line) > OSM_DB_MAX_WORD_LEN)
-          {
-            osm_log( p_log, OSM_LOG_ERROR,
-                     "osm_db_restore: ERR 610B: "
-                     " Illegal lids from line:%u : %s (file:%s)\n",
-                     line_num, sLine, p_domain_imp->file_name);
-            status = 1;
-            goto EndParsing;
-          }
           p_accum_val =
             (char*)cl_malloc(sizeof(char)*(strlen(p_rest_of_line) + 1));
           strcpy(p_accum_val, p_rest_of_line);