Author: rmilecki Date: 2015-07-08 08:05:43 +0200 (Wed, 08 Jul 2015) New Revision: 46262
Modified: trunk/package/utils/nvram/src/nvram.c trunk/package/utils/nvram/src/nvram.h Log: nvram: get rid of NVRAM_SPACE Now we support NVRAM whatever its size is. Signed-off-by: Rafa?\197?\130 Mi?\197?\130ecki <[email protected]> Modified: trunk/package/utils/nvram/src/nvram.c =================================================================== --- trunk/package/utils/nvram/src/nvram.c 2015-07-08 05:45:09 UTC (rev 46261) +++ trunk/package/utils/nvram/src/nvram.c 2015-07-08 06:05:43 UTC (rev 46262) @@ -65,7 +65,7 @@ static nvram_tuple_t * _nvram_realloc( nvram_handle_t *h, nvram_tuple_t *t, const char *name, const char *value ) { - if ((strlen(value) + 1) > NVRAM_SPACE) + if ((strlen(value) + 1) > h->length - h->offset) return NULL; if (!t) { @@ -395,7 +395,7 @@ header = nvram_header(h); if (header->magic == NVRAM_MAGIC && - (rdonly || header->len < NVRAM_SPACE)) { + (rdonly || header->len < h->length - h->offset)) { _nvram_rehash(h); free(mtd); return h; Modified: trunk/package/utils/nvram/src/nvram.h =================================================================== --- trunk/package/utils/nvram/src/nvram.h 2015-07-08 05:45:09 UTC (rev 46261) +++ trunk/package/utils/nvram/src/nvram.h 2015-07-08 06:05:43 UTC (rev 46262) @@ -114,7 +114,6 @@ /* NVRAM constants */ #define NVRAM_MIN_SPACE 0x8000 -#define NVRAM_SPACE 0x10000 #define NVRAM_MAGIC 0x48534C46 /* 'FLSH' */ #define NVRAM_VERSION 1 _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
