mirror of
https://gitlab.freedesktop.org/libfprint/libfprint.git
synced 2025-11-15 07:38:12 +00:00
Fix indentation issues with uncrustify-0.76.0
Apparently older version didn't find this indentation issues
This commit is contained in:
@@ -102,9 +102,9 @@ plot_minutiae (unsigned char *rgbdata,
|
|||||||
int i;
|
int i;
|
||||||
|
|
||||||
#define write_pixel(num) do { \
|
#define write_pixel(num) do { \
|
||||||
rgbdata[((num) * 3)] = 0xff; \
|
rgbdata[((num) * 3)] = 0xff; \
|
||||||
rgbdata[((num) * 3) + 1] = 0; \
|
rgbdata[((num) * 3) + 1] = 0; \
|
||||||
rgbdata[((num) * 3) + 2] = 0; \
|
rgbdata[((num) * 3) + 2] = 0; \
|
||||||
} while(0)
|
} while(0)
|
||||||
|
|
||||||
for (i = 0; i < minutiae->len; i++)
|
for (i = 0; i < minutiae->len; i++)
|
||||||
|
|||||||
@@ -74,26 +74,26 @@ struct _FpiDeviceUpeksonly
|
|||||||
FpiSsm *loopsm;
|
FpiSsm *loopsm;
|
||||||
|
|
||||||
/* Do we really need multiple concurrent transfers? */
|
/* Do we really need multiple concurrent transfers? */
|
||||||
GCancellable *img_cancellable;
|
GCancellable *img_cancellable;
|
||||||
GPtrArray *img_transfers;
|
GPtrArray *img_transfers;
|
||||||
int num_flying;
|
int num_flying;
|
||||||
|
|
||||||
GSList *rows;
|
GSList *rows;
|
||||||
unsigned num_rows;
|
unsigned num_rows;
|
||||||
unsigned char *rowbuf;
|
unsigned char *rowbuf;
|
||||||
int rowbuf_offset;
|
int rowbuf_offset;
|
||||||
|
|
||||||
int wraparounds;
|
int wraparounds;
|
||||||
int num_blank;
|
int num_blank;
|
||||||
int num_nonblank;
|
int num_nonblank;
|
||||||
enum sonly_fs finger_state;
|
enum sonly_fs finger_state;
|
||||||
int last_seqnum;
|
int last_seqnum;
|
||||||
|
|
||||||
enum sonly_kill_transfers_action killing_transfers;
|
enum sonly_kill_transfers_action killing_transfers;
|
||||||
GError *kill_error;
|
GError *kill_error;
|
||||||
FpiSsm *kill_ssm;
|
FpiSsm *kill_ssm;
|
||||||
|
|
||||||
struct fpi_line_asmbl_ctx assembling_ctx;
|
struct fpi_line_asmbl_ctx assembling_ctx;
|
||||||
};
|
};
|
||||||
G_DECLARE_FINAL_TYPE (FpiDeviceUpeksonly, fpi_device_upeksonly, FPI,
|
G_DECLARE_FINAL_TYPE (FpiDeviceUpeksonly, fpi_device_upeksonly, FPI,
|
||||||
DEVICE_UPEKSONLY, FpImageDevice);
|
DEVICE_UPEKSONLY, FpImageDevice);
|
||||||
|
|||||||
@@ -162,9 +162,9 @@ enum {
|
|||||||
|
|
||||||
/* Dump buffer for debug */
|
/* Dump buffer for debug */
|
||||||
#define dump_buffer(buf) \
|
#define dump_buffer(buf) \
|
||||||
fp_dbg ("%02x %02x %02x %02x %02x %02x %02x %02x", \
|
fp_dbg ("%02x %02x %02x %02x %02x %02x %02x %02x", \
|
||||||
buf[6], buf[7], buf[8], buf[9], buf[10], buf[11], buf[12], buf[13] \
|
buf[6], buf[7], buf[8], buf[9], buf[10], buf[11], buf[12], buf[13] \
|
||||||
)
|
)
|
||||||
|
|
||||||
/* Callback of asynchronous send */
|
/* Callback of asynchronous send */
|
||||||
static void
|
static void
|
||||||
|
|||||||
@@ -157,7 +157,7 @@ vfs301_proto_generate_0B (int subtype, gssize *len)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#define HEX_TO_INT(c) \
|
#define HEX_TO_INT(c) \
|
||||||
(((c) >= '0' && (c) <= '9') ? ((c) - '0') : ((c) - 'A' + 10))
|
(((c) >= '0' && (c) <= '9') ? ((c) - '0') : ((c) - 'A' + 10))
|
||||||
|
|
||||||
static guint8 *
|
static guint8 *
|
||||||
translate_str (const char **srcL, gssize *len)
|
translate_str (const char **srcL, gssize *len)
|
||||||
@@ -422,15 +422,15 @@ img_process_data (int first_block, FpDeviceVfs301 *dev, const guint8 *buf, int l
|
|||||||
/************************** PROTOCOL STUFF ************************************/
|
/************************** PROTOCOL STUFF ************************************/
|
||||||
|
|
||||||
#define USB_RECV(from, len) \
|
#define USB_RECV(from, len) \
|
||||||
usb_recv (dev, from, len, NULL, NULL)
|
usb_recv (dev, from, len, NULL, NULL)
|
||||||
|
|
||||||
#define USB_SEND(type, subtype) \
|
#define USB_SEND(type, subtype) \
|
||||||
{ \
|
{ \
|
||||||
const guint8 *data; \
|
const guint8 *data; \
|
||||||
gssize len; \
|
gssize len; \
|
||||||
data = vfs301_proto_generate (type, subtype, &len); \
|
data = vfs301_proto_generate (type, subtype, &len); \
|
||||||
usb_send (dev, data, len, NULL); \
|
usb_send (dev, data, len, NULL); \
|
||||||
}
|
}
|
||||||
|
|
||||||
#define RAW_DATA(x) g_memdup2 (x, sizeof (x)), sizeof (x)
|
#define RAW_DATA(x) g_memdup2 (x, sizeof (x)), sizeof (x)
|
||||||
|
|
||||||
@@ -489,13 +489,13 @@ vfs301_proto_peek_event (FpDeviceVfs301 *dev)
|
|||||||
* we will run into timeouts randomly and need to then try again.
|
* we will run into timeouts randomly and need to then try again.
|
||||||
*/
|
*/
|
||||||
#define PARALLEL_RECEIVE(e1, l1, e2, l2) \
|
#define PARALLEL_RECEIVE(e1, l1, e2, l2) \
|
||||||
{ \
|
{ \
|
||||||
g_autoptr(GError) error = NULL; \
|
g_autoptr(GError) error = NULL; \
|
||||||
usb_recv (dev, e1, l1, NULL, &error); \
|
usb_recv (dev, e1, l1, NULL, &error); \
|
||||||
usb_recv (dev, e2, l2, NULL, NULL); \
|
usb_recv (dev, e2, l2, NULL, NULL); \
|
||||||
if (g_error_matches (error, G_USB_DEVICE_ERROR, G_USB_DEVICE_ERROR_TIMED_OUT)) \
|
if (g_error_matches (error, G_USB_DEVICE_ERROR, G_USB_DEVICE_ERROR_TIMED_OUT)) \
|
||||||
usb_recv (dev, e1, l1, NULL, NULL); \
|
usb_recv (dev, e1, l1, NULL, NULL); \
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
vfs301_proto_process_event_cb (FpiUsbTransfer *transfer,
|
vfs301_proto_process_event_cb (FpiUsbTransfer *transfer,
|
||||||
|
|||||||
@@ -41,30 +41,30 @@ struct usb_action
|
|||||||
};
|
};
|
||||||
|
|
||||||
#define SEND(ENDPOINT, COMMAND) \
|
#define SEND(ENDPOINT, COMMAND) \
|
||||||
{ \
|
{ \
|
||||||
.type = ACTION_SEND, \
|
.type = ACTION_SEND, \
|
||||||
.endpoint = ENDPOINT, \
|
.endpoint = ENDPOINT, \
|
||||||
.name = #COMMAND, \
|
.name = #COMMAND, \
|
||||||
.size = sizeof (COMMAND), \
|
.size = sizeof (COMMAND), \
|
||||||
.data = COMMAND \
|
.data = COMMAND \
|
||||||
},
|
},
|
||||||
|
|
||||||
#define RECV(ENDPOINT, SIZE) \
|
#define RECV(ENDPOINT, SIZE) \
|
||||||
{ \
|
{ \
|
||||||
.type = ACTION_RECEIVE, \
|
.type = ACTION_RECEIVE, \
|
||||||
.endpoint = ENDPOINT, \
|
.endpoint = ENDPOINT, \
|
||||||
.size = SIZE, \
|
.size = SIZE, \
|
||||||
.data = NULL \
|
.data = NULL \
|
||||||
},
|
},
|
||||||
|
|
||||||
#define RECV_CHECK(ENDPOINT, SIZE, EXPECTED) \
|
#define RECV_CHECK(ENDPOINT, SIZE, EXPECTED) \
|
||||||
{ \
|
{ \
|
||||||
.type = ACTION_RECEIVE, \
|
.type = ACTION_RECEIVE, \
|
||||||
.endpoint = ENDPOINT, \
|
.endpoint = ENDPOINT, \
|
||||||
.size = SIZE, \
|
.size = SIZE, \
|
||||||
.data = EXPECTED, \
|
.data = EXPECTED, \
|
||||||
.correct_reply_size = sizeof (EXPECTED) \
|
.correct_reply_size = sizeof (EXPECTED) \
|
||||||
},
|
},
|
||||||
|
|
||||||
struct usbexchange_data
|
struct usbexchange_data
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -51,39 +51,39 @@ struct usb_action
|
|||||||
};
|
};
|
||||||
|
|
||||||
#define SEND(ENDPOINT, COMMAND) \
|
#define SEND(ENDPOINT, COMMAND) \
|
||||||
{ \
|
{ \
|
||||||
.type = ACTION_SEND, \
|
.type = ACTION_SEND, \
|
||||||
.endpoint = ENDPOINT, \
|
.endpoint = ENDPOINT, \
|
||||||
.name = #COMMAND, \
|
.name = #COMMAND, \
|
||||||
.size = sizeof (COMMAND), \
|
.size = sizeof (COMMAND), \
|
||||||
.data = COMMAND \
|
.data = COMMAND \
|
||||||
},
|
},
|
||||||
|
|
||||||
#define RECV(ENDPOINT, SIZE) \
|
#define RECV(ENDPOINT, SIZE) \
|
||||||
{ \
|
{ \
|
||||||
.type = ACTION_RECEIVE, \
|
.type = ACTION_RECEIVE, \
|
||||||
.endpoint = ENDPOINT, \
|
.endpoint = ENDPOINT, \
|
||||||
.size = SIZE, \
|
.size = SIZE, \
|
||||||
.data = NULL \
|
.data = NULL \
|
||||||
},
|
},
|
||||||
|
|
||||||
#define RECV_CHECK(ENDPOINT, SIZE, EXPECTED) \
|
#define RECV_CHECK(ENDPOINT, SIZE, EXPECTED) \
|
||||||
{ \
|
{ \
|
||||||
.type = ACTION_RECEIVE, \
|
.type = ACTION_RECEIVE, \
|
||||||
.endpoint = ENDPOINT, \
|
.endpoint = ENDPOINT, \
|
||||||
.size = SIZE, \
|
.size = SIZE, \
|
||||||
.data = EXPECTED, \
|
.data = EXPECTED, \
|
||||||
.correct_reply_size = sizeof (EXPECTED) \
|
.correct_reply_size = sizeof (EXPECTED) \
|
||||||
},
|
},
|
||||||
|
|
||||||
#define RECV_CHECK_SIZE(ENDPOINT, SIZE, EXPECTED) \
|
#define RECV_CHECK_SIZE(ENDPOINT, SIZE, EXPECTED) \
|
||||||
{ \
|
{ \
|
||||||
.type = ACTION_RECEIVE, \
|
.type = ACTION_RECEIVE, \
|
||||||
.endpoint = ENDPOINT, \
|
.endpoint = ENDPOINT, \
|
||||||
.size = SIZE, \
|
.size = SIZE, \
|
||||||
.data = NULL, \
|
.data = NULL, \
|
||||||
.correct_reply_size = sizeof (EXPECTED) \
|
.correct_reply_size = sizeof (EXPECTED) \
|
||||||
},
|
},
|
||||||
|
|
||||||
struct usbexchange_data
|
struct usbexchange_data
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ G_BEGIN_DECLS
|
|||||||
G_DECLARE_FINAL_TYPE (FpPrint, fp_print, FP, PRINT, GInitiallyUnowned)
|
G_DECLARE_FINAL_TYPE (FpPrint, fp_print, FP, PRINT, GInitiallyUnowned)
|
||||||
|
|
||||||
#define FP_FINGER_IS_VALID(finger) \
|
#define FP_FINGER_IS_VALID(finger) \
|
||||||
((finger) >= FP_FINGER_FIRST && (finger) <= FP_FINGER_LAST)
|
((finger) >= FP_FINGER_FIRST && (finger) <= FP_FINGER_LAST)
|
||||||
|
|
||||||
#include "fp-device.h"
|
#include "fp-device.h"
|
||||||
|
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (GDate, g_date_free);
|
|||||||
#define g_memdup2(data, size) g_memdup ((data), (size))
|
#define g_memdup2(data, size) g_memdup ((data), (size))
|
||||||
#else
|
#else
|
||||||
#define g_memdup2(data, size) \
|
#define g_memdup2(data, size) \
|
||||||
(G_GNUC_EXTENSION ({ \
|
(G_GNUC_EXTENSION ({ \
|
||||||
G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
|
G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
|
||||||
g_memdup2 ((data), (size)); \
|
g_memdup2 ((data), (size)); \
|
||||||
G_GNUC_END_IGNORE_DEPRECATIONS \
|
G_GNUC_END_IGNORE_DEPRECATIONS \
|
||||||
|
|||||||
@@ -80,12 +80,12 @@
|
|||||||
* Uses fp_err() to print an error if the @condition is true.
|
* Uses fp_err() to print an error if the @condition is true.
|
||||||
*/
|
*/
|
||||||
#define BUG_ON(condition) G_STMT_START \
|
#define BUG_ON(condition) G_STMT_START \
|
||||||
if (condition) { \
|
if (condition) { \
|
||||||
char *s; \
|
char *s; \
|
||||||
s = g_strconcat ("BUG: (", #condition, ")", NULL); \
|
s = g_strconcat ("BUG: (", #condition, ")", NULL); \
|
||||||
fp_err ("%s: %s() %s:%d", s, G_STRFUNC, __FILE__, __LINE__); \
|
fp_err ("%s: %s() %s:%d", s, G_STRFUNC, __FILE__, __LINE__); \
|
||||||
g_free (s); \
|
g_free (s); \
|
||||||
} G_STMT_END
|
} G_STMT_END
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* BUG:
|
* BUG:
|
||||||
|
|||||||
@@ -60,7 +60,7 @@ typedef void (*FpiSsmHandlerCallback)(FpiSsm *ssm,
|
|||||||
|
|
||||||
/* for library and drivers */
|
/* for library and drivers */
|
||||||
#define fpi_ssm_new(dev, handler, nr_states) \
|
#define fpi_ssm_new(dev, handler, nr_states) \
|
||||||
fpi_ssm_new_full (dev, handler, nr_states, nr_states, #nr_states)
|
fpi_ssm_new_full (dev, handler, nr_states, nr_states, #nr_states)
|
||||||
FpiSsm *fpi_ssm_new_full (FpDevice *dev,
|
FpiSsm *fpi_ssm_new_full (FpDevice *dev,
|
||||||
FpiSsmHandlerCallback handler,
|
FpiSsmHandlerCallback handler,
|
||||||
int nr_states,
|
int nr_states,
|
||||||
|
|||||||
Reference in New Issue
Block a user