Author: stefanct Date: Sun Dec 30 02:23:17 2012 New Revision: 1639 URL: http://flashrom.org/trac/flashrom/changeset/1639
Log: Constify parameters and globals. This makes some stuff const (partially to get a more convenient libflashrom interface). Signed-off-by: Nico Huber <[email protected]> Signed-off-by: Stefan Tauner <[email protected]> Acked-by: Stefan Tauner <[email protected]> Modified: trunk/cli_classic.c trunk/flash.h trunk/flashrom.c trunk/programmer.h Modified: trunk/cli_classic.c ============================================================================== --- trunk/cli_classic.c Sat Dec 29 20:26:55 2012 (r1638) +++ trunk/cli_classic.c Sun Dec 30 02:23:17 2012 (r1639) @@ -532,7 +532,7 @@ free(layoutfile); free(pparam); /* clean up global variables */ - free(chip_to_probe); + free((char *)chip_to_probe); /* Silence! Freeing is not modifying contents. */ chip_to_probe = NULL; #ifndef STANDALONE ret |= close_logfile(); Modified: trunk/flash.h ============================================================================== --- trunk/flash.h Sat Dec 29 20:26:55 2012 (r1638) +++ trunk/flash.h Sun Dec 30 02:23:17 2012 (r1639) @@ -222,7 +222,7 @@ extern int verbose_screen; extern int verbose_logfile; extern const char flashrom_version[]; -extern char *chip_to_probe; +extern const char *chip_to_probe; void map_flash_registers(struct flashctx *flash); int read_memmapped(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); int erase_flash(struct flashctx *flash); @@ -231,7 +231,7 @@ int min(int a, int b); int max(int a, int b); void tolower_string(char *str); -char *extract_param(char **haystack, const char *needle, const char *delim); +char *extract_param(const char *const *haystack, const char *needle, const char *delim); int verify_range(struct flashctx *flash, uint8_t *cmpbuf, unsigned int start, unsigned int len); int need_erase(uint8_t *have, uint8_t *want, unsigned int len, enum write_granularity gran); char *strcat_realloc(char *dest, const char *src); Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Sat Dec 29 20:26:55 2012 (r1638) +++ trunk/flashrom.c Sun Dec 30 02:23:17 2012 (r1639) @@ -40,13 +40,13 @@ #include "hwaccess.h" const char flashrom_version[] = FLASHROM_VERSION; -char *chip_to_probe = NULL; +const char *chip_to_probe = NULL; int verbose_screen = MSG_INFO; int verbose_logfile = MSG_DEBUG2; static enum programmer programmer = PROGRAMMER_INVALID; -static char *programmer_param = NULL; +static const char *programmer_param = NULL; /* * Programmers supporting multiple buses can have differing size limits on @@ -351,7 +351,7 @@ return 0; } -int programmer_init(enum programmer prog, char *param) +int programmer_init(enum programmer prog, const char *param) { int ret; @@ -517,7 +517,7 @@ * needle and remove everything from the first occurrence of needle to the next * delimiter from haystack. */ -char *extract_param(char **haystack, const char *needle, const char *delim) +char *extract_param(const char *const *haystack, const char *needle, const char *delim) { char *param_pos, *opt_pos, *rest; char *opt = NULL; Modified: trunk/programmer.h ============================================================================== --- trunk/programmer.h Sat Dec 29 20:26:55 2012 (r1638) +++ trunk/programmer.h Sun Dec 30 02:23:17 2012 (r1639) @@ -122,7 +122,7 @@ extern const struct programmer_entry programmer_table[]; -int programmer_init(enum programmer prog, char *param); +int programmer_init(enum programmer prog, const char *param); int programmer_shutdown(void); enum bitbang_spi_master_type { _______________________________________________ flashrom mailing list [email protected] http://www.flashrom.org/mailman/listinfo/flashrom
