mirror of
https://gitlab.com/mishakmak/pam-fprint-grosshack.git
synced 2026-04-08 20:03:34 +02:00
Fix a bunch of warnings
More warnings fixed in the file storage.
This commit is contained in:
committed by
Daniel Drake
parent
0a075532c7
commit
35ae4dd071
@ -37,6 +37,8 @@
|
|||||||
|
|
||||||
#include <libfprint/fprint.h>
|
#include <libfprint/fprint.h>
|
||||||
|
|
||||||
|
#include "file_storage.h"
|
||||||
|
|
||||||
#define DIR_PERMS 0700
|
#define DIR_PERMS 0700
|
||||||
|
|
||||||
#ifndef FILE_STORAGE_PATH
|
#ifndef FILE_STORAGE_PATH
|
||||||
@ -97,9 +99,7 @@ int file_storage_print_data_save(struct fp_print_data *data,
|
|||||||
enum fp_finger finger, const char *username)
|
enum fp_finger finger, const char *username)
|
||||||
{
|
{
|
||||||
GError *err = NULL;
|
GError *err = NULL;
|
||||||
char *path;
|
char *path, *dirpath, *buf;
|
||||||
char *dirpath;
|
|
||||||
unsigned char *buf;
|
|
||||||
size_t len;
|
size_t len;
|
||||||
int r;
|
int r;
|
||||||
char *base_store = NULL;
|
char *base_store = NULL;
|
||||||
@ -110,7 +110,7 @@ int file_storage_print_data_save(struct fp_print_data *data,
|
|||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
len = fp_print_data_get_data(data, &buf);
|
len = fp_print_data_get_data(data, (guchar **) &buf);
|
||||||
if (!len) {
|
if (!len) {
|
||||||
g_free(base_store);
|
g_free(base_store);
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
@ -145,7 +145,7 @@ int file_storage_print_data_save(struct fp_print_data *data,
|
|||||||
static int load_from_file(char *path, struct fp_print_data **data)
|
static int load_from_file(char *path, struct fp_print_data **data)
|
||||||
{
|
{
|
||||||
gsize length;
|
gsize length;
|
||||||
gchar *contents;
|
char *contents;
|
||||||
GError *err = NULL;
|
GError *err = NULL;
|
||||||
struct fp_print_data *fdata;
|
struct fp_print_data *fdata;
|
||||||
|
|
||||||
@ -161,7 +161,7 @@ static int load_from_file(char *path, struct fp_print_data **data)
|
|||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
fdata = fp_print_data_from_data(contents, length);
|
fdata = fp_print_data_from_data((guchar *) contents, length);
|
||||||
g_free(contents);
|
g_free(contents);
|
||||||
if (!fdata)
|
if (!fdata)
|
||||||
return -EIO;
|
return -EIO;
|
||||||
|
|||||||
Reference in New Issue
Block a user