depau/libfprint
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert "lib: Mark fpi_ssm_get_user_data as deprecated"

Browse source 
This reverts commit 1fd82b5162.

This was causing too many warnings at this stage of porting. We'll add
it again when most of the drivers are ported.
This commit is contained in:
Bastien Nocera 2018-09-28 14:26:12 +02:00
parent 7cfe20e07f
commit 36f527269b
2 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libfprint/fpi-ssm.c
View file

@ -124,9 +124,6 @@ fpi_ssm *fpi_ssm_new(struct fp_dev *dev,
* is called. * is called.
* *
* Returns: a pointer * Returns: a pointer
*
* Deprecated: Make sure your asynchronous functions pass that
* @user_data along.
*/ */
void * void *
fpi_ssm_get_user_data(fpi_ssm *machine) fpi_ssm_get_user_data(fpi_ssm *machine)

4
libfprint/fpi-ssm.h
View file

@ -28,8 +28,6 @@
#include <glib.h> #include <glib.h>
#include <libusb.h> #include <libusb.h>
#include "fprint.h"
/* async drv <--> lib comms */ /* async drv <--> lib comms */
/** /**
@ -82,7 +80,7 @@ void fpi_ssm_next_state_timeout_cb(struct fp_dev *dev, void *data);
void fpi_ssm_jump_to_state(fpi_ssm *machine, int state); void fpi_ssm_jump_to_state(fpi_ssm *machine, int state);
void fpi_ssm_mark_completed(fpi_ssm *machine); void fpi_ssm_mark_completed(fpi_ssm *machine);
void fpi_ssm_mark_failed(fpi_ssm *machine, int error); void fpi_ssm_mark_failed(fpi_ssm *machine, int error);
void *fpi_ssm_get_user_data(fpi_ssm *machine) LIBFPRINT_DEPRECATED; void *fpi_ssm_get_user_data(fpi_ssm *machine);
int fpi_ssm_get_error(fpi_ssm *machine); int fpi_ssm_get_error(fpi_ssm *machine);
int fpi_ssm_get_cur_state(fpi_ssm *machine); int fpi_ssm_get_cur_state(fpi_ssm *machine);