>From 13e91e936e8f7d277362a843667d4efa83c4cc6c Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Tue, 20 May 2008 11:11:08 +0100 Subject: [PATCH] Constify username Fixes a few warnings on compilation --- src/file_storage.c | 10 +++++----- src/file_storage.h | 8 ++++---- src/storage.h | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/file_storage.c b/src/file_storage.c index 4ad5e62..0a50980 100644 --- a/src/file_storage.c +++ b/src/file_storage.c @@ -78,7 +78,7 @@ static char *get_path_to_print(struct fp_dev *dev, enum fp_finger finger, char * fp_dev_get_devtype(dev), finger, base_store); } -static int file_storage_get_basestore_for_username(char *username, char **base_store) +static int file_storage_get_basestore_for_username(const char *username, char **base_store) { char *dirpath = FILE_STORAGE_PATH; @@ -88,7 +88,7 @@ static int file_storage_get_basestore_for_username(char *username, char **base_s /* if username == NULL function will use current username */ int file_storage_print_data_save(struct fp_print_data *data, - enum fp_finger finger, char *username) + enum fp_finger finger, const char *username) { GError *err = NULL; char *path; @@ -164,7 +164,7 @@ static int load_from_file(char *path, struct fp_print_data **data) } int file_storage_print_data_load(struct fp_dev *dev, - enum fp_finger finger, struct fp_print_data **data, char *username) + enum fp_finger finger, struct fp_print_data **data, const char *username) { gchar *path; struct fp_print_data *fdata = NULL; @@ -194,7 +194,7 @@ int file_storage_print_data_load(struct fp_dev *dev, } int file_storage_print_data_delete(struct fp_dev *dev, - enum fp_finger finger, char *username) + enum fp_finger finger, const char *username) { int r; char *base_store; @@ -252,7 +252,7 @@ static GSList *scan_dev_storedir(char *devpath, uint16_t driver_id, return list; } -GSList *file_storage_discover_prints(struct fp_dev *dev, char *username) +GSList *file_storage_discover_prints(struct fp_dev *dev, const char *username) { //GDir *dir; //const gchar *ent; diff --git a/src/file_storage.h b/src/file_storage.h index ace8234..7ba4e4a 100644 --- a/src/file_storage.h +++ b/src/file_storage.h @@ -23,19 +23,19 @@ #define FILE_STORAGE_H int file_storage_print_data_save(struct fp_print_data *data, - enum fp_finger finger, char *username); + enum fp_finger finger, const char *username); int file_storage_print_data_load(struct fp_dev *dev, - enum fp_finger finger, struct fp_print_data **data, char *username); + enum fp_finger finger, struct fp_print_data **data, const char *username); int file_storage_print_data_delete(struct fp_dev *dev, - enum fp_finger finger, char *username); + enum fp_finger finger, const char *username); int file_storage_init(void); int file_storage_deinit(void); -GSList *file_storage_discover_prints(struct fp_dev *dev, char *username); +GSList *file_storage_discover_prints(struct fp_dev *dev, const char *username); #endif diff --git a/src/storage.h b/src/storage.h index de758ed..a593985 100644 --- a/src/storage.h +++ b/src/storage.h @@ -25,12 +25,12 @@ #include "file_storage.h" typedef int (*storage_print_data_save)(struct fp_print_data *data, - enum fp_finger finger, char *username); + enum fp_finger finger, const char *username); typedef int (*storage_print_data_load)(struct fp_dev *dev, - enum fp_finger finger, struct fp_print_data **data, char *username); + enum fp_finger finger, struct fp_print_data **data, const char *username); typedef int (*storage_print_data_delete)(struct fp_dev *dev, - enum fp_finger finger, char *username); -typedef GSList *(*storage_discover_prints)(struct fp_dev *dev, char *username); + enum fp_finger finger, const char *username); +typedef GSList *(*storage_discover_prints)(struct fp_dev *dev, const char *username); typedef int (*storage_init)(void); typedef int (*storage_deinit)(void); -- 1.5.4.5