cookiez/pam-fprint-grosshack
1
0
Fork 0
mirror of https://gitlab.com/mishakmak/pam-fprint-grosshack.git synced 2026-04-09 12:23:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

file: Simplify file_storage_get_basestore_for_username() usage

Browse Source 
file_storage_get_basestore_for_username() can never fail, so simplify
its callers by removing the error checking.
This commit is contained in:
Seong-Joong Kim
2019-02-14 11:44:15 +09:00
parent 5e76441210
commit dbeeb95756
1 changed files with 6 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/file_storage.c
View File

@ -82,12 +82,9 @@ static char *get_path_to_print_dscv(struct fp_dscv_dev *dev, enum fp_finger fing
fp_dscv_dev_get_devtype(dev), finger, base_store); fp_dscv_dev_get_devtype(dev), finger, base_store);
} }
static int file_storage_get_basestore_for_username(const char *username, char **base_store) static char *file_storage_get_basestore_for_username(const char *username)
{ {
char *dirpath = FILE_STORAGE_PATH; return g_build_filename(FILE_STORAGE_PATH, username, NULL);
*base_store = g_build_filename(dirpath, username, NULL);
return 0;
} }
/* if username == NULL function will use current username */ /* if username == NULL function will use current username */
@ -101,10 +98,7 @@ int file_storage_print_data_save(struct fp_print_data *data,
char *base_store = NULL; char *base_store = NULL;
char *buf = NULL; char *buf = NULL;
r = file_storage_get_basestore_for_username(username, &base_store); base_store = file_storage_get_basestore_for_username(username);
if (r < 0)
goto out;
len = fp_print_data_get_data(data, (guchar **) &buf); len = fp_print_data_get_data(data, (guchar **) &buf);
if (!len) { if (!len) {
@ -173,11 +167,7 @@ int file_storage_print_data_load(struct fp_dev *dev,
int r; int r;
char *base_store = NULL; char *base_store = NULL;
r = file_storage_get_basestore_for_username(username, &base_store); base_store = file_storage_get_basestore_for_username(username);
if (r < 0) {
return r;
}
path = get_path_to_print(dev, finger, base_store); path = get_path_to_print(dev, finger, base_store);
r = load_from_file(path, &fdata); r = load_from_file(path, &fdata);
@ -201,11 +191,7 @@ int file_storage_print_data_delete(struct fp_dscv_dev *dev,
int r; int r;
char *base_store; char *base_store;
r = file_storage_get_basestore_for_username(username, &base_store); base_store = file_storage_get_basestore_for_username(username);
if (r < 0) {
return r;
}
gchar *path = get_path_to_print_dscv(dev, finger, base_store); gchar *path = get_path_to_print_dscv(dev, finger, base_store);
@ -258,12 +244,7 @@ GSList *file_storage_discover_prints(struct fp_dscv_dev *dev, const char *userna
char *storedir = NULL; char *storedir = NULL;
int r; int r;
base_store = file_storage_get_basestore_for_username(username);
r = file_storage_get_basestore_for_username(username, &base_store);
if (r < 0) {
return NULL;
}
storedir = get_path_to_storedir(fp_driver_get_driver_id(fp_dscv_dev_get_driver(dev)), storedir = get_path_to_storedir(fp_driver_get_driver_id(fp_dscv_dev_get_driver(dev)),
fp_dscv_dev_get_devtype(dev), base_store); fp_dscv_dev_get_devtype(dev), base_store);