From 164ff7b1052f81bf3bfb1b65269f5b10998a99ab Mon Sep 17 00:00:00 2001 From: eitan Date: Thu, 9 Mar 2006 07:21:48 +0000 Subject: [PATCH] [OpenSM] - fix error messages to match linux trunk. git-svn-id: svn://openib.tc.cornell.edu/gen1@235 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86 --- trunk/ulp/opensm/user/opensm/osm_db_files.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/trunk/ulp/opensm/user/opensm/osm_db_files.c b/trunk/ulp/opensm/user/opensm/osm_db_files.c index 917c3451..8527a57e 100644 --- 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); -- 2.41.0