openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-26 22:52:34 +02:00
Code Issues Releases Wiki Activity

Constify parameters and globals

Browse Source 
This makes some stuff const (partially to get a more convenient
libflashrom interface).

Corresponding to flashrom svn r1639.

Signed-off-by: Nico Huber <nico.huber@secunet.com>
Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
This commit is contained in:
Nico Huber 2012-12-30 01:23:17 +00:00 committed by Stefan Tauner
parent 6282966cc0
commit bcb2e5a708
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli_classic.c
View File

@ -532,7 +532,7 @@ out:
free(layoutfile); free(layoutfile);
free(pparam); free(pparam);
/* clean up global variables */ /* clean up global variables */
free(chip_to_probe); free((char *)chip_to_probe); /* Silence! Freeing is not modifying contents. */
chip_to_probe = NULL; chip_to_probe = NULL;
#ifndef STANDALONE #ifndef STANDALONE
ret |= close_logfile(); ret |= close_logfile();

4
flash.h
View File

@ -222,7 +222,7 @@ void print_supported_wiki(void);
extern int verbose_screen; extern int verbose_screen;
extern int verbose_logfile; extern int verbose_logfile;
extern const char flashrom_version[]; extern const char flashrom_version[];
extern char *chip_to_probe; extern const char *chip_to_probe;
void map_flash_registers(struct flashctx *flash); void map_flash_registers(struct flashctx *flash);
int read_memmapped(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); int read_memmapped(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len);
int erase_flash(struct flashctx *flash); int erase_flash(struct flashctx *flash);
@ -231,7 +231,7 @@ int read_flash_to_file(struct flashctx *flash, const char *filename);
int min(int a, int b); int min(int a, int b);
int max(int a, int b); int max(int a, int b);
void tolower_string(char *str); 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 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); int need_erase(uint8_t *have, uint8_t *want, unsigned int len, enum write_granularity gran);
char *strcat_realloc(char *dest, const char *src); char *strcat_realloc(char *dest, const char *src);

8
flashrom.c
View File

@ -40,13 +40,13 @@
#include "hwaccess.h" #include "hwaccess.h"
const char flashrom_version[] = FLASHROM_VERSION; const char flashrom_version[] = FLASHROM_VERSION;
char *chip_to_probe = NULL; const char *chip_to_probe = NULL;
int verbose_screen = MSG_INFO; int verbose_screen = MSG_INFO;
int verbose_logfile = MSG_DEBUG2; int verbose_logfile = MSG_DEBUG2;
static enum programmer programmer = PROGRAMMER_INVALID; 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 * Programmers supporting multiple buses can have differing size limits on
@ -351,7 +351,7 @@ int register_shutdown(int (*function) (void *data), void *data)
return 0; return 0;
} }
int programmer_init(enum programmer prog, char *param) int programmer_init(enum programmer prog, const char *param)
{ {
int ret; int ret;
@ -517,7 +517,7 @@ char *strcat_realloc(char *dest, const char *src)
* needle and remove everything from the first occurrence of needle to the next * needle and remove everything from the first occurrence of needle to the next
* delimiter from haystack. * 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 *param_pos, *opt_pos, *rest;
char *opt = NULL; char *opt = NULL;

2
programmer.h
View File

@ -122,7 +122,7 @@ struct programmer_entry {
extern const struct programmer_entry programmer_table[]; 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); int programmer_shutdown(void);
enum bitbang_spi_master_type { enum bitbang_spi_master_type {