Changeset 3582

Show
Ignore:
Timestamp:
09/18/08 16:49:33 (2 months ago)
Author:
stepan
Message:

fix two minor bugs in nvramtool. (trivial)
Signed-off-by: Stefan Reinauer <stepan@…>
Acked-by: Stefan Reinauer <stepan@…>

Location:
trunk/util/nvramtool
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • trunk/util/nvramtool/layout.h

    r3122 r3582  
    6060   cmos_entry_config_t config; 
    6161   unsigned config_id; 
    62    char name[CMOS_MAX_NAME_LENGTH]; 
     62   char name[CMOS_MAX_NAME_LENGTH + 1]; 
    6363 } 
    6464cmos_entry_t; 
     
    7070 { unsigned config_id; 
    7171   unsigned long long value; 
    72    char text[CMOS_MAX_TEXT_LENGTH]; 
     72   char text[CMOS_MAX_TEXT_LENGTH + 1]; 
    7373 } 
    7474cmos_enum_t; 
  • trunk/util/nvramtool/lbtable.c

    r3122 r3582  
    3131\*****************************************************************************/ 
    3232 
     33#include <string.h> 
    3334#include <sys/mman.h> 
    3435#include "common.h" 
     
    557558    { cmos_enum.config_id = p->config_id; 
    558559      cmos_enum.value = p->value; 
    559       strncpy(cmos_enum.text, p->text, CMOS_MAX_TEXT_LENGTH); 
     560      strncpy(cmos_enum.text, (char *)p->text, CMOS_MAX_TEXT_LENGTH); 
    560561      cmos_enum.text[CMOS_MAX_TEXT_LENGTH] = '\0'; 
    561562      try_add_cmos_table_enum(&cmos_enum); 
     
    590591 
    591592      cmos_entry.config_id = q->config_id; 
    592       strncpy(cmos_entry.name, q->name, CMOS_MAX_NAME_LENGTH); 
     593      strncpy(cmos_entry.name, (char *)q->name, CMOS_MAX_NAME_LENGTH); 
    593594      cmos_entry.name[CMOS_MAX_NAME_LENGTH] = '\0'; 
    594595      try_add_cmos_table_entry(&cmos_entry);