diff options
| author | Todd McKenney <todd.mckenney@oracle.com> | 2010-07-25 17:40:14 -0600 |
|---|---|---|
| committer | Todd McKenney <todd.mckenney@oracle.com> | 2010-07-25 17:40:14 -0600 |
| commit | 30f762d67fa939128fc0e0c8eb56847185685531 (patch) | |
| tree | 83b42c6c1395e0a357087535de33e1bf6c7d2513 /usr/src/lib/fm | |
| parent | 7656b92221e26376547b0dc52b67e7a414ea9775 (diff) | |
| download | illumos-joyent-30f762d67fa939128fc0e0c8eb56847185685531.tar.gz | |
6971696 Do not look at type field to determine log severity level
Diffstat (limited to 'usr/src/lib/fm')
| -rw-r--r-- | usr/src/lib/fm/libseslog/common/libseslog.c | 23 | ||||
| -rw-r--r-- | usr/src/lib/fm/libseslog/common/libseslog.h | 2 |
2 files changed, 0 insertions, 25 deletions
diff --git a/usr/src/lib/fm/libseslog/common/libseslog.c b/usr/src/lib/fm/libseslog/common/libseslog.c index a4715404b6..2cedf583f3 100644 --- a/usr/src/lib/fm/libseslog/common/libseslog.c +++ b/usr/src/lib/fm/libseslog/common/libseslog.c @@ -229,12 +229,10 @@ save_logs(unsigned char *resp, ses_log_call_t *data) unsigned char *log_param_ptr; /* Log parameter pointer */ unsigned char *log_str_ptr; /* ptr to ascii str returend by expander */ - char log_event_type[ENTRY_MAX_SIZE]; char log_code[ENTRY_MAX_SIZE]; char log_level[ENTRY_MAX_SIZE]; nvlist_t *entry; char entry_num[15]; - int type; int match_found = 0; char save_buffer[MAX_LOG_ENTRY_SZ]; char entry_added = 0; @@ -332,7 +330,6 @@ save_logs(unsigned char *resp, ses_log_call_t *data) return (SES_LOG_FAILED_NVLIST_CREATE); } - (void) memset(log_event_type, 0, sizeof (log_event_type)); (void) memset(log_code, 0, sizeof (log_code)); (void) memset(save_buffer, 0, sizeof (save_buffer)); (void) memset(log_level, 0, sizeof (log_level)); @@ -378,9 +375,6 @@ save_logs(unsigned char *resp, ses_log_call_t *data) (const char *)log_str_ptr, SES_LOG_VALID_LOG_SIZE); - (void) strncpy(log_event_type, (const char *)log_str_ptr + - SES_LOG_EVENT_TYPE_START, SES_LOG_SPECIFIC_ENTRY_SIZE); - (void) strncpy(log_code, (const char *)log_str_ptr+SES_LOG_CODE_START, SES_LOG_SPECIFIC_ENTRY_SIZE); @@ -389,23 +383,6 @@ save_logs(unsigned char *resp, ses_log_call_t *data) (const char *) log_str_ptr + SES_LOG_LEVEL_START, 1); - /* event type is in log_event_type */ - /* 4x004 = looking for x */ - type = (strtoul(log_event_type, 0, 16) >> 12) & 0xf; - - /* - * Check type. If type is 1, level needs to be - * changed to FATAL(4). If type is something other - * than 0 or 1, they are info only(0). - */ - if (type == 1) { - (void) strcpy(log_level, "4"); - } else if (type > 1) { - /* These are not application log */ - /* entries */ - /* make them info only */ - (void) strcpy(log_level, "0"); - } /* Add this entry to the nvlist log data */ if (nvlist_alloc(&entry, NV_UNIQUE_NAME, 0) != 0) { diff --git a/usr/src/lib/fm/libseslog/common/libseslog.h b/usr/src/lib/fm/libseslog/common/libseslog.h index 49dcd30d95..4541f7905c 100644 --- a/usr/src/lib/fm/libseslog/common/libseslog.h +++ b/usr/src/lib/fm/libseslog/common/libseslog.h @@ -74,8 +74,6 @@ enum { /* The string log is made from 8 char entries */ #define SES_LOG_SPECIFIC_ENTRY_SIZE 8 -/* Index of where log event type starts */ -#define SES_LOG_EVENT_TYPE_START 4 /* Index of where sequence number starts in returned string */ #define SES_LOG_SEQ_NUM_START 27 /* Index of where log code starts */ |