[settings] Extend numerical setting tags to "unsigned long"

Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/core/memmap_settings.c b/src/core/memmap_settings.c
index fab3e5f3a2114aaa2d9d5630c94541213ae35385..1098bd756e1cb919d6963627c90a7360619dcd8c 100644 (file)
--- a/src/core/memmap_settings.c
+++ b/src/core/memmap_settings.c
@@ -145,7 +145,7 @@ static int memmap_settings_fetch ( struct settings *settings,
        unsigned int i;
        unsigned int count;
 
-       DBGC ( settings, "MEMMAP start %d count %d %s%s%s%s scale %d\n",
+       DBGC ( settings, "MEMMAP start %ld count %ld %s%s%s%s scale %ld\n",
               MEMMAP_START ( setting->tag ), MEMMAP_COUNT ( setting->tag ),
               ( MEMMAP_INCLUDE_START ( setting->tag ) ? "start" : "" ),
               ( ( MEMMAP_INCLUDE_START ( setting->tag ) &&

diff --git a/src/core/settings.c b/src/core/settings.c
index f6f62d22668ed71ba6b5df9c4ef97f21921fa309..7575557810e7949b7da102a2c4f870a9817f0a16 100644 (file)
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -1474,9 +1474,9 @@ struct setting * find_setting ( const char *name ) {
  * @v name             Name
  * @ret tag            Tag number, or 0 if not a valid number
  */
-static unsigned int parse_setting_tag ( const char *name ) {
+static unsigned long parse_setting_tag ( const char *name ) {
        char *tmp = ( ( char * ) name );
-       unsigned int tag = 0;
+       unsigned long tag = 0;
 
        while ( 1 ) {
                tag = ( ( tag << 8 ) | strtoul ( tmp, &tmp, 0 ) );

diff --git a/src/include/ipxe/settings.h b/src/include/ipxe/settings.h
index b44794af29f1ce7c1b3132a32bd003336e63a740..6534c25b62f30b12618a857357b8f110b1e6e965 100644 (file)
--- a/src/include/ipxe/settings.h
+++ b/src/include/ipxe/settings.h
@@ -40,7 +40,7 @@ struct setting {
         * (such as a DHCP option number, or an SMBIOS structure and
         * field number).
         */
-       unsigned int tag;
+       unsigned long tag;
        /** Setting scope (or NULL)
         *
         * For historic reasons, a NULL scope with a non-zero tag