Release 1.90.7

It's not smart as g_strdup, so need to ensure we don't use it for NULL
strings.

This is a regression caused by commit bf223662

.git-blame-ignore-revs

@@ -0,0 +1,7 @@
+# The commits that did automated reformatting. You can ignore them
+# during git-blame with `--ignore-rev` or `--ignore-revs-file`.
+#
+#   $ git config --add 'blame.ignoreRevsFile' '.git-blame-ignore-revs'
+#
+
+f73429f06226f5423c92b1c504313657c9b6f9b5

.gitlab-ci.yml

@@ -29,6 +29,11 @@ variables:
 
 image: "$FEDORA_IMAGE"
 
+stages:
+  - check-source
+  - build
+  - test
+
 .fprintd_build_preconditions:
   except:
     variables:
@@ -47,8 +52,17 @@ image: "$FEDORA_IMAGE"
     # So we don't get error about this libfprint file
     - echo "libfprint/demo/gtk-libfprint-test.ui" >> po/POTFILES.skip
 
+test_indent:
+  stage: check-source
+  extends: .fprintd_build_preconditions
+  script:
+    - scripts/uncrustify.sh
+    - git diff
+    - "! git status -s | grep -q ."
+
 build_stable:
   extends: .fprintd_build_preconditions
+  stage: build
   script:
     - meson _build
     - ninja -C _build -v
@@ -58,6 +72,7 @@ build_dev:
   extends:
     - .fprintd_build_preconditions
     - .install_libfprint_dev
+  stage: build
   script:
     - meson _build --werror -Dgtk_doc=true
     - ninja -C _build -v

NEWS

@@ -1,6 +1,16 @@
 This file lists notable changes in each release. For the full history of all
 changes, see ChangeLog.
 
+Version 1.90.7:
+
+While 1.90.6 fixed a number of issues, we did have a bad regression due
+causing pam_fprintd to crash when there are no fingerprint devices
+installed.
+
+Highlights:
+ - pam: Guard strdup calls against NULL pointers
+
+
 Version 1.90.6:
 
 The 1.90.5 release was unusable due to a number of inter-related issues

meson.build

@@ -1,5 +1,5 @@
 project('fprintd', 'c',
-    version: '1.90.6',
+    version: '1.90.7',
     license: 'GPLv2+',
     default_options: [
         'buildtype=debugoptimized',

pam/fingerprint-strings.h

@@ -28,16 +28,18 @@
 
 #define GNUC_UNUSED __attribute__((__unused__))
 
-static bool str_equal (const char *a, const char *b)
+static bool
+str_equal (const char *a, const char *b)
 {
   if (a == NULL && b == NULL)
     return true;
   if (a == NULL || b == NULL)
     return false;
-	return (strcmp (a, b) == 0);
+  return strcmp (a, b) == 0;
 }
 
-struct {
+struct
+{
   const char *dbus_name;
   const char *place_str_generic;
   const char *place_str_specific;
@@ -105,33 +107,44 @@ struct {
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wformat-nonliteral"
 
-GNUC_UNUSED static char *finger_str_to_msg(const char *finger_name, const char *driver_name, bool is_swipe)
+GNUC_UNUSED static char *
+finger_str_to_msg (const char *finger_name, const char *driver_name, bool is_swipe)
 {
   int i;
 
   if (finger_name == NULL)
     return NULL;
 
-	for (i = 0; fingers[i].dbus_name != NULL; i++) {
+  for (i = 0; fingers[i].dbus_name != NULL; i++)
-		if (str_equal (fingers[i].dbus_name, finger_name)) {
+    {
-			if (is_swipe == false) {
+      if (!str_equal (fingers[i].dbus_name, finger_name))
-				if (driver_name) {
+        continue;
+      if (is_swipe == false)
+        {
+          if (driver_name)
+            {
               char *s;
               int ret;
               ret = asprintf (&s, TR (fingers[i].place_str_specific), driver_name);
               return ret >= 0 ? s : NULL;
-				} else {
+            }
+          else
+            {
               return strdup (TR (fingers[i].place_str_generic));
             }
-			} else {
+        }
-				if (driver_name) {
+      else
+        {
+          if (driver_name)
+            {
               char *s;
               int ret;
               ret = asprintf (&s, TR (fingers[i].swipe_str_specific), driver_name);
               return ret >= 0 ? s : NULL;
-				} else {
-					return strdup (TR (fingers[i].swipe_str_generic));
             }
+          else
+            {
+              return strdup (TR (fingers[i].swipe_str_generic));
             }
         }
     }
@@ -146,12 +159,14 @@ GNUC_UNUSED static char *finger_str_to_msg(const char *finger_name, const char *
  * verify-match
  * verify-unknown-error
  */
-GNUC_UNUSED static const char *verify_result_str_to_msg(const char *result, bool is_swipe)
+GNUC_UNUSED static const char *
+verify_result_str_to_msg (const char *result, bool is_swipe)
 {
   if (result == NULL)
     return NULL;
 
-	if (strcmp (result, "verify-retry-scan") == 0) {
+  if (strcmp (result, "verify-retry-scan") == 0)
+    {
       if (is_swipe == false)
         return TR (N_("Place your finger on the reader again"));
       else
@@ -172,12 +187,14 @@ GNUC_UNUSED static const char *verify_result_str_to_msg(const char *result, bool
  * enroll-failed
  * enroll-unknown-error
  */
-GNUC_UNUSED static const char *enroll_result_str_to_msg(const char *result, bool is_swipe)
+GNUC_UNUSED static const char *
+enroll_result_str_to_msg (const char *result, bool is_swipe)
 {
   if (result == NULL)
     return NULL;
 
-	if (strcmp (result, "enroll-retry-scan") == 0 || strcmp (result, "enroll-stage-passed") == 0) {
+  if (strcmp (result, "enroll-retry-scan") == 0 || strcmp (result, "enroll-stage-passed") == 0)
+    {
       if (is_swipe == false)
         return TR (N_("Place your finger on the reader again"));
       else
@@ -192,4 +209,3 @@ GNUC_UNUSED static const char *enroll_result_str_to_msg(const char *result, bool
 
   return NULL;
 }
-

pam/pam_fprintd.c

@@ -64,18 +64,21 @@ static uint64_t
 now (void)
 {
   struct timespec ts;
+
   clock_gettime (CLOCK_MONOTONIC, &ts);
   return (uint64_t) ts.tv_sec * USEC_PER_SEC + (uint64_t) ts.tv_nsec / NSEC_PER_USEC;
 }
 
-static bool str_has_prefix (const char *s, const char *prefix)
+static bool
+str_has_prefix (const char *s, const char *prefix)
 {
   if (s == NULL || prefix == NULL)
     return false;
-	return (strncmp (s, prefix, strlen (prefix)) == 0);
+  return strncmp (s, prefix, strlen (prefix)) == 0;
 }
 
-static bool send_msg(pam_handle_t *pamh, const char *msg, int style)
+static bool
+send_msg (pam_handle_t *pamh, const char *msg, int style)
 {
   const struct pam_message mymsg = {
     .msg_style = style,
@@ -91,15 +94,17 @@ static bool send_msg(pam_handle_t *pamh, const char *msg, int style)
   if (!pc || !pc->conv)
     return false;
 
-	return (pc->conv(1, &msgp, &resp, pc->appdata_ptr) == PAM_SUCCESS);
+  return pc->conv (1, &msgp, &resp, pc->appdata_ptr) == PAM_SUCCESS;
 }
 
-static bool send_info_msg(pam_handle_t *pamh, const char *msg)
+static bool
+send_info_msg (pam_handle_t *pamh, const char *msg)
 {
   return send_msg (pamh, msg, PAM_TEXT_INFO);
 }
 
-static bool send_err_msg(pam_handle_t *pamh, const char *msg)
+static bool
+send_err_msg (pam_handle_t *pamh, const char *msg)
 {
   return send_msg (pamh, msg, PAM_ERROR_MSG);
 }
@@ -125,13 +130,15 @@ open_device (pam_handle_t    *pamh,
                           "GetDevices",
                           &error,
                           &m,
-				NULL) < 0) {
+                          NULL) < 0)
+    {
       pam_syslog (pamh, LOG_ERR, "GetDevices failed: %s", error.message);
       return NULL;
     }
 
   r = sd_bus_message_enter_container (m, 'a', "o");
-	if (r < 0) {
+  if (r < 0)
+    {
       pam_syslog (pamh, LOG_ERR, "Failed to parse answer from GetDevices(): %d", r);
       return NULL;
     }
@@ -148,10 +155,11 @@ open_device (pam_handle_t    *pamh,
 
   sd_bus_message_exit_container (m);
 
-	return strdup (path);
+  return path ? strdup (path) : NULL;
 }
 
-typedef struct {
+typedef struct
+{
   char         *dev;
   bool          has_multiple_devices;
 
@@ -189,19 +197,22 @@ verify_result (sd_bus_message *m,
   uint64_t done = false;
   int r;
 
-	if (!sd_bus_message_is_signal(m, "net.reactivated.Fprint.Device", "VerifyStatus")) {
+  if (!sd_bus_message_is_signal (m, "net.reactivated.Fprint.Device", "VerifyStatus"))
+    {
       pam_syslog (data->pamh, LOG_ERR, "Not the signal we expected (iface: %s, member: %s)",
                   sd_bus_message_get_interface (m),
                   sd_bus_message_get_member (m));
       return 0;
     }
 
-	if ((r = sd_bus_message_read (m, "sb", &result, &done)) < 0) {
+  if ((r = sd_bus_message_read (m, "sb", &result, &done)) < 0)
+    {
       pam_syslog (data->pamh, LOG_ERR, "Failed to parse VerifyResult signal: %d", r);
       return 0;
     }
 
-	if (!data->verify_started) {
+  if (!data->verify_started)
+    {
       pam_syslog (data->pamh, LOG_ERR, "Unexpected VerifyResult '%s', %" PRIu64 " signal", result, done);
       return 0;
     }
@@ -209,18 +220,21 @@ verify_result (sd_bus_message *m,
   if (debug)
     pam_syslog (data->pamh, LOG_DEBUG, "Verify result: %s (done: %d)", result, done ? 1 : 0);
 
-	if (data->result) {
+  if (data->result)
+    {
       free (data->result);
       data->result = NULL;
     }
 
-	if (done) {
+  if (done && result)
+    {
       data->result = strdup (result);
       return 0;
     }
 
   msg = verify_result_str_to_msg (result, data->is_swipe);
-	if (!msg) {
+  if (!msg)
+    {
       data->result = strdup ("Protocol error with fprintd!");
       return 0;
     }
@@ -238,18 +252,21 @@ verify_finger_selected (sd_bus_message *m,
   const char *finger_name = NULL;
   pf_autofree char *msg = NULL;
 
-	if (sd_bus_message_read_basic (m, 's', &finger_name) < 0) {
+  if (sd_bus_message_read_basic (m, 's', &finger_name) < 0)
+    {
       pam_syslog (data->pamh, LOG_ERR, "Failed to parse VerifyFingerSelected signal: %d", errno);
       return 0;
     }
 
-	if (!data->verify_started) {
+  if (!data->verify_started)
+    {
       pam_syslog (data->pamh, LOG_ERR, "Unexpected VerifyFingerSelected %s signal", finger_name);
       return 0;
     }
 
   msg = finger_str_to_msg (finger_name, data->driver, data->is_swipe);
-	if (!msg) {
+  if (!msg)
+    {
       data->result = strdup ("Protocol error with fprintd!");
       return 0;
     }
@@ -268,7 +285,8 @@ get_property_string (sd_bus *bus,
                      const char   *interface,
                      const char   *member,
                      sd_bus_error *error,
-		     char **ret) {
+                     char        **ret)
+{
 
   pf_autoptr (sd_bus_message) reply = NULL;
   const char *s;
@@ -288,26 +306,31 @@ get_property_string (sd_bus *bus,
     return sd_bus_error_set_errno (error, r);
 
   n = strdup (s);
-	if (!n) {
+  if (!n)
     return sd_bus_error_set_errno (error, -ENOMEM);
-	}
 
   *ret = n;
   return 0;
 }
 
 
-static int verify_started_cb (sd_bus_message *m,
+static int
+verify_started_cb (sd_bus_message *m,
                    void           *userdata,
-			      sd_bus_error   *ret_error) {
+                   sd_bus_error   *ret_error)
+{
   const sd_bus_error *error = sd_bus_message_get_error (m);
   verify_data *data = userdata;
 
-	if (error) {
+  if (error)
-		if (sd_bus_error_has_name (error, "net.reactivated.Fprint.Error.NoEnrolledPrints")) {
+    {
+      if (sd_bus_error_has_name (error, "net.reactivated.Fprint.Error.NoEnrolledPrints"))
+        {
           pam_syslog (data->pamh, LOG_DEBUG, "No prints enrolled");
           data->verify_ret = PAM_USER_UNKNOWN;
-		} else {
+        }
+      else
+        {
           data->verify_ret = PAM_AUTH_ERR;
         }
 
@@ -349,7 +372,8 @@ do_verify (sd_bus       *bus,
   if (str_equal (scan_type, "swipe"))
     data->is_swipe = true;
 
-	if (data->has_multiple_devices) {
+  if (data->has_multiple_devices)
+    {
       get_property_string (bus,
                            "net.reactivated.Fprint",
                            data->dev,
@@ -381,7 +405,8 @@ do_verify (sd_bus       *bus,
                        verify_finger_selected,
                        data);
 
-	while (data->max_tries > 0) {
+  while (data->max_tries > 0)
+    {
       uint64_t verification_end = now () + (timeout * USEC_PER_SEC);
 
       data->timed_out = false;
@@ -405,13 +430,15 @@ do_verify (sd_bus       *bus,
                                     "s",
                                     "any");
 
-		if (r < 0) {
+      if (r < 0)
+        {
           if (debug)
             pam_syslog (data->pamh, LOG_DEBUG, "VerifyStart call failed: %d", r);
           break;
         }
 
-		for (;;) {
+      for (;;)
+        {
           int64_t wait_time;
 
           wait_time = verification_end - now ();
@@ -427,8 +454,10 @@ do_verify (sd_bus       *bus,
             continue;
           if (data->result != NULL)
             break;
-			if (r == 0) {
+          if (r == 0)
-				if (debug) {
+            {
+              if (debug)
+                {
                   pam_syslog (data->pamh, LOG_DEBUG,
                               "Waiting for %" PRId64 " seconds (%" PRId64 " usecs)",
                               wait_time / USEC_PER_SEC,
@@ -439,11 +468,11 @@ do_verify (sd_bus       *bus,
             }
         }
 
-		if (data->verify_ret != PAM_INCOMPLETE) {
+      if (data->verify_ret != PAM_INCOMPLETE)
         return data->verify_ret;
-		}
 
-		if (now () >= verification_end) {
+      if (now () >= verification_end)
+        {
           data->timed_out = true;
           send_info_msg (data->pamh, _("Verification timed out"));
         }
@@ -460,18 +489,30 @@ do_verify (sd_bus       *bus,
                           NULL,
                           NULL);
 
-		if (data->timed_out) {
+      if (data->timed_out)
+        {
           return PAM_AUTHINFO_UNAVAIL;
-		} else {
+        }
-			if (str_equal (data->result, "verify-no-match")) {
+      else
+        {
+          if (str_equal (data->result, "verify-no-match"))
+            {
               send_err_msg (data->pamh, "Failed to match fingerprint");
-			} else if (str_equal (data->result, "verify-match")) {
+            }
+          else if (str_equal (data->result, "verify-match"))
+            {
               return PAM_SUCCESS;
-			} else if (str_equal (data->result, "verify-unknown-error")) {
+            }
+          else if (str_equal (data->result, "verify-unknown-error"))
+            {
               return PAM_AUTHINFO_UNAVAIL;
-			} else if (str_equal (data->result, "verify-disconnected")) {
+            }
+          else if (str_equal (data->result, "verify-disconnected"))
+            {
               return PAM_AUTHINFO_UNAVAIL;
-			} else {
+            }
+          else
+            {
               send_err_msg (data->pamh, _("An unknown error occurred"));
               return PAM_AUTH_ERR;
             }
@@ -506,19 +547,20 @@ user_has_prints (pam_handle_t *pamh,
                           &m,
                           "s",
                           username);
-	if (r < 0) {
+  if (r < 0)
+    {
       /* If ListEnrolledFingers fails then verification should
        * also fail (both use the same underlying call), so we
        * report false here and bail out early.  */
-		if (debug) {
+      if (debug)
         pam_syslog (pamh, LOG_DEBUG, "ListEnrolledFingers failed for %s: %s",
                     username, error.message);
-		}
       return false;
     }
 
   r = sd_bus_message_enter_container (m, 'a', "s");
-	if (r < 0) {
+  if (r < 0)
+    {
       pam_syslog (pamh, LOG_ERR, "Failed to parse answer from ListEnrolledFingers(): %d", r);
       return false;
     }
@@ -527,7 +569,7 @@ user_has_prints (pam_handle_t *pamh,
     num_fingers++;
   sd_bus_message_exit_container (m);
 
-	return (num_fingers > 0);
+  return num_fingers > 0;
 }
 
 static void
@@ -545,10 +587,9 @@ release_device (pam_handle_t *pamh,
                           &error,
                           NULL,
                           NULL,
-				NULL) < 0) {
+                          NULL) < 0)
     pam_syslog (pamh, LOG_ERR, "ReleaseDevice failed: %s", error.message);
 }
-}
 
 static bool
 claim_device (pam_handle_t *pamh,
@@ -566,7 +607,8 @@ claim_device (pam_handle_t *pamh,
                           &error,
                           NULL,
                           "s",
-				username) < 0) {
+                          username) < 0)
+    {
       if (debug)
         pam_syslog (pamh, LOG_DEBUG, "failed to claim device %s", error.message);
       return false;
@@ -585,7 +627,8 @@ name_owner_changed (sd_bus_message *m,
   const char *old_owner = NULL;
   const char *new_owner = NULL;
 
-	if (sd_bus_message_read (m, "sss", &name, &old_owner, &new_owner) < 0) {
+  if (sd_bus_message_read (m, "sss", &name, &old_owner, &new_owner) < 0)
+    {
       pam_syslog (data->pamh, LOG_ERR, "Failed to parse NameOwnerChanged signal: %d", errno);
       return 0;
     }
@@ -603,9 +646,11 @@ name_owner_changed (sd_bus_message *m,
   return 0;
 }
 
-static int do_auth(pam_handle_t *pamh, const char *username)
+static int
+do_auth (pam_handle_t *pamh, const char *username)
 {
   bool have_prints;
+
   pf_autoptr (verify_data) data = NULL;
   pf_autoptr (sd_bus) bus = NULL;
   pf_autoptr (sd_bus_slot) name_owner_changed_slot = NULL;
@@ -614,7 +659,8 @@ static int do_auth(pam_handle_t *pamh, const char *username)
   data->max_tries = max_tries;
   data->pamh = pamh;
 
-	if (sd_bus_open_system (&bus) < 0) {
+  if (sd_bus_open_system (&bus) < 0)
+    {
       pam_syslog (pamh, LOG_ERR, "Error with getting the bus: %d", errno);
       return PAM_AUTHINFO_UNAVAIL;
     }
@@ -630,9 +676,8 @@ static int do_auth(pam_handle_t *pamh, const char *username)
                        data);
 
   data->dev = open_device (pamh, bus, &data->has_multiple_devices);
-	if (data->dev == NULL) {
+  if (data->dev == NULL)
     return PAM_AUTHINFO_UNAVAIL;
-	}
 
   have_prints = user_has_prints (pamh, bus, data->dev, username);
   if (debug)
@@ -641,7 +686,8 @@ static int do_auth(pam_handle_t *pamh, const char *username)
   if (!have_prints)
     return PAM_AUTHINFO_UNAVAIL;
 
-	if (claim_device (pamh, bus, data->dev, username)) {
+  if (claim_device (pamh, bus, data->dev, username))
+    {
       int ret = do_verify (bus, data);
       release_device (pamh, bus, data->dev);
       return ret;
@@ -662,9 +708,8 @@ is_remote (pam_handle_t *pamh)
    * We want to not run for known remote hosts */
   if (rhost != NULL &&
       *rhost != '\0' &&
-	    strcmp (rhost, "localhost") != 0) {
+      strcmp (rhost, "localhost") != 0)
     return true;
-	}
 
   if (sd_session_is_remote (NULL) > 0)
     return true;
@@ -672,7 +717,8 @@ is_remote (pam_handle_t *pamh)
   return false;
 }
 
-PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc,
+PAM_EXTERN int
+pam_sm_authenticate (pam_handle_t *pamh, int flags, int argc,
                      const char **argv)
 {
   const char *username;
@@ -687,48 +733,64 @@ PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc,
   if (pam_get_user (pamh, &username, NULL) != PAM_SUCCESS)
     return PAM_AUTHINFO_UNAVAIL;
 
-	for (i = 0; i < argc; i++) {
+  for (i = 0; i < argc; i++)
-		if (argv[i] != NULL) {
+    {
-			if (str_equal (argv[i], "debug")) {
+      if (argv[i] != NULL)
+        {
+          if (str_equal (argv[i], "debug"))
+            {
               pam_syslog (pamh, LOG_DEBUG, "debug on");
               debug = true;
-			} else if (str_has_prefix (argv[i], DEBUG_MATCH)) {
+            }
+          else if (str_has_prefix (argv[i], DEBUG_MATCH))
+            {
               pam_syslog (pamh, LOG_DEBUG, "debug on");
               const char *value;
 
               value = argv[i] + strlen (DEBUG_MATCH);
               if (str_equal (value, "on") ||
                   str_equal (value, "true") ||
-				    str_equal (value, "1")) {
+                  str_equal (value, "1"))
+                {
                   pam_syslog (pamh, LOG_DEBUG, "debug on");
                   debug = true;
-				} else if (str_equal (value, "off") ||
+                }
+              else if (str_equal (value, "off") ||
                        str_equal (value, "false") ||
-					   str_equal (value, "0")) {
+                       str_equal (value, "0"))
+                {
                   debug = false;
-				} else {
+                }
+              else
+                {
                   pam_syslog (pamh, LOG_DEBUG, "invalid debug value '%s', disabling", value);
                 }
-			} else if (str_has_prefix (argv[i], MAX_TRIES_MATCH) && strlen(argv[i]) == strlen (MAX_TRIES_MATCH) + 1) {
+            }
+          else if (str_has_prefix (argv[i], MAX_TRIES_MATCH) && strlen (argv[i]) == strlen (MAX_TRIES_MATCH) + 1)
+            {
               max_tries = atoi (argv[i] + strlen (MAX_TRIES_MATCH));
-				if (max_tries < 1) {
+              if (max_tries < 1)
-					if (debug) {
+                {
+                  if (debug)
                     pam_syslog (pamh, LOG_DEBUG, "invalid max tries '%s', using %d",
                                 argv[i] + strlen (MAX_TRIES_MATCH), DEFAULT_MAX_TRIES);
-					}
                   max_tries = DEFAULT_MAX_TRIES;
                 }
               if (debug)
                 pam_syslog (pamh, LOG_DEBUG, "max_tries specified as: %d", max_tries);
-			} else if (str_has_prefix (argv[i], TIMEOUT_MATCH) && strlen(argv[i]) <= strlen (TIMEOUT_MATCH) + 2) {
+            }
+          else if (str_has_prefix (argv[i], TIMEOUT_MATCH) && strlen (argv[i]) <= strlen (TIMEOUT_MATCH) + 2)
+            {
               timeout = atoi (argv[i] + strlen (TIMEOUT_MATCH));
-				if (timeout < MIN_TIMEOUT) {
+              if (timeout < MIN_TIMEOUT)
-					if (debug) {
+                {
+                  if (debug)
                     pam_syslog (pamh, LOG_DEBUG, "timeout %d secs too low, using %d",
                                 timeout, MIN_TIMEOUT);
-					}
                   timeout = MIN_TIMEOUT;
-				} else if (debug) {
+                }
+              else if (debug)
+                {
                   pam_syslog (pamh, LOG_DEBUG, "timeout specified as: %d secs", timeout);
                 }
             }
@@ -738,15 +800,16 @@ PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc,
   return do_auth (pamh, username);
 }
 
-PAM_EXTERN int pam_sm_setcred(pam_handle_t *pamh, int flags, int argc,
+PAM_EXTERN int
+pam_sm_setcred (pam_handle_t *pamh, int flags, int argc,
                 const char **argv)
 {
   return PAM_SUCCESS;
 }
 
-PAM_EXTERN int pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc,
+PAM_EXTERN int
+pam_sm_chauthtok (pam_handle_t *pamh, int flags, int argc,
                   const char **argv)
 {
   return PAM_SUCCESS;
 }
-

pam/pam_fprintd_autoptrs.h

@@ -43,6 +43,7 @@ static inline void
 autoptr_cleanup_generic_free (void *p)
 {
   void **pp = (void **) p;
+
   free (*pp);
 }
 

scripts/uncrustify.cfg

@@ -0,0 +1,137 @@
+newlines                lf
+
+input_tab_size          8
+output_tab_size         8
+
+string_escape_char      92
+string_escape_char2     0
+
+# indenting
+indent_columns          2
+indent_with_tabs        0
+indent_align_string     True
+indent_brace            2
+indent_braces           false
+indent_braces_no_func   True
+indent_func_call_param  false
+indent_func_def_param   false
+indent_func_proto_param false
+indent_switch_case      0
+indent_case_brace       2
+indent_paren_close      1
+
+# spacing
+sp_arith                        Add
+sp_assign                       Add
+sp_enum_assign                  Add
+sp_bool                         Add
+sp_compare                      Add
+sp_inside_paren                 Remove
+sp_inside_fparens               Remove
+sp_func_def_paren               Force
+sp_func_proto_paren             Force
+sp_paren_paren                  Remove
+sp_balance_nested_parens        False
+sp_paren_brace                  Remove
+sp_before_square                Remove
+sp_before_squares               Remove
+sp_inside_square                Remove
+sp_before_ptr_star              Add
+sp_between_ptr_star             Remove
+sp_after_comma                  Add
+sp_before_comma                 Remove
+sp_after_cast                   Add
+sp_sizeof_paren                 Add
+sp_not                          Remove
+sp_inv                          Remove
+sp_addr                         Remove
+sp_member                       Remove
+sp_deref                        Remove
+sp_sign                         Remove
+sp_incdec                       Remove
+sp_attribute_paren              remove
+sp_macro                        Force
+sp_func_call_paren              Force
+sp_func_call_user_paren         Remove
+set func_call_user _ N_ C_ g_autoptr g_auto
+sp_brace_typedef                add
+sp_cond_colon                   add
+sp_cond_question                add
+sp_defined_paren                remove
+
+# alignment
+align_keep_tabs                 False
+align_with_tabs                 False
+align_on_tabstop                False
+align_number_right              False
+align_func_params               True
+align_var_def_span              0
+align_var_def_amp_style         1
+align_var_def_colon             true
+align_enum_equ_span             0
+align_var_struct_span           2
+align_var_def_star_style        2
+align_var_def_amp_style         2
+align_typedef_span              2
+align_typedef_func              0
+align_typedef_star_style        2
+align_typedef_amp_style         2
+
+# newlines
+nl_assign_leave_one_liners      True
+nl_enum_leave_one_liners        False
+nl_func_leave_one_liners        False
+nl_if_leave_one_liners          False
+nl_end_of_file                  Add
+nl_assign_brace                 Remove
+nl_func_var_def_blk             1
+nl_fcall_brace                  Add
+nl_enum_brace                   Remove
+nl_struct_brace                 Force
+nl_union_brace                  Force
+nl_if_brace                     Force
+nl_brace_else                   Force
+nl_elseif_brace                 Force
+nl_else_brace                   Add
+nl_for_brace                    Force
+nl_while_brace                  Force
+nl_do_brace                     Force
+nl_brace_while                  Force
+nl_switch_brace                 Force
+nl_before_case                  True
+nl_after_case                   False
+nl_func_type_name               Force
+nl_func_proto_type_name         Remove
+nl_func_paren                   Remove
+nl_func_decl_start              Remove
+nl_func_decl_args               Force
+nl_func_decl_end                Remove
+nl_fdef_brace                   Force
+nl_after_return                 False
+nl_define_macro                 False
+nl_create_if_one_liner          False
+nl_create_for_one_liner         False
+nl_create_while_one_liner       False
+nl_after_semicolon              True
+nl_multi_line_cond              true
+
+# mod
+# I'd like these to be remove, but that removes brackets in if { if { foo } }, which i dislike
+# Not clear what to do about that...
+mod_full_brace_for              Remove
+mod_full_brace_if               Remove
+mod_full_brace_if_chain         True
+mod_full_brace_while            Remove
+mod_full_brace_do               Remove
+mod_full_brace_nl               3
+mod_paren_on_return             Remove
+
+# line splitting
+#code_width                     = 78
+ls_for_split_full               True
+ls_func_split_full              True
+
+# positioning
+pos_bool                        Trail
+pos_conditional                 Trail
+

scripts/uncrustify.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+SRCROOT=`git rev-parse --show-toplevel`
+CFG="$SRCROOT/scripts/uncrustify.cfg"
+echo "srcroot: $SRCROOT"
+
+case "$1" in
+    -c|--check)
+	OPTS="--check"
+        ;;
+    *)
+	OPTS="--replace --no-backup"
+        ;;
+esac
+
+pushd "$SRCROOT"
+uncrustify -c "$CFG" $OPTS `git ls-tree --name-only -r HEAD | grep -E '.*\.[ch]$' | grep -v build/`
+RES=$?
+popd
+exit $RES

src/file_storage.c

@@ -44,7 +44,8 @@
 
 static char *storage_path = NULL;
 
-static const char *get_storage_path(void)
+static const char *
+get_storage_path (void)
 {
   const char *path = NULL;
 
@@ -55,10 +56,12 @@ static const char *get_storage_path(void)
    * taking into account the StateDirectory
    * unit file setting */
   path = g_getenv ("STATE_DIRECTORY");
-	if (path != NULL) {
+  if (path != NULL)
+    {
       /* If multiple directories are set, then in the environment variable
        * the paths are concatenated with colon (":"). */
-		if (strchr (path, ':')) {
+      if (strchr (path, ':'))
+        {
           g_auto(GStrv) elems = NULL;
           elems = g_strsplit (path, ":", -1);
           storage_path = g_strdup (elems[0]);
@@ -71,12 +74,14 @@ static const char *get_storage_path(void)
   return storage_path;
 }
 
-static char *get_path_to_storedir(const char *driver, const char * device_id, char *base_store)
+static char *
+get_path_to_storedir (const char *driver, const char * device_id, char *base_store)
 {
   return g_build_filename (base_store, driver, device_id, NULL);
 }
 
-static char *__get_path_to_print(const char *driver, const char * device_id,
+static char *
+__get_path_to_print (const char *driver, const char * device_id,
                      FpFinger finger, char *base_store)
 {
   g_autofree char *dirpath = NULL;
@@ -90,7 +95,8 @@ static char *__get_path_to_print(const char *driver, const char * device_id,
   return path;
 }
 
-static char *get_path_to_print(FpDevice *dev, FpFinger finger, char *base_store)
+static char *
+get_path_to_print (FpDevice *dev, FpFinger finger, char *base_store)
 {
   return __get_path_to_print (fp_device_get_driver (dev),
                               fp_device_get_device_id (dev),
@@ -98,7 +104,8 @@ static char *get_path_to_print(FpDevice *dev, FpFinger finger, char *base_store)
                               base_store);
 }
 
-static char *get_path_to_print_dscv(FpDevice *dev, FpFinger finger, char *base_store)
+static char *
+get_path_to_print_dscv (FpDevice *dev, FpFinger finger, char *base_store)
 {
   return __get_path_to_print (fp_device_get_driver (dev),
                               fp_device_get_device_id (dev),
@@ -106,12 +113,14 @@ static char *get_path_to_print_dscv(FpDevice *dev, FpFinger finger, char *base_s
                               base_store);
 }
 
-static char *file_storage_get_basestore_for_username(const char *username)
+static char *
+file_storage_get_basestore_for_username (const char *username)
 {
   return g_build_filename (get_storage_path (), username, NULL);
 }
 
-int file_storage_print_data_save(FpPrint *print)
+int
+file_storage_print_data_save (FpPrint *print)
 {
   g_autoptr(GError) err = NULL;
   g_autofree char *path = NULL;
@@ -123,7 +132,8 @@ int file_storage_print_data_save(FpPrint *print)
 
   base_store = file_storage_get_basestore_for_username (fp_print_get_username (print));
 
-	if (!fp_print_serialize (print, (guchar **) &buf, &len, &err)) {
+  if (!fp_print_serialize (print, (guchar **) &buf, &len, &err))
+    {
       g_warning ("Error serializing data: %s", err->message);
       return -ENOMEM;
     }
@@ -134,7 +144,8 @@ int file_storage_print_data_save(FpPrint *print)
                               base_store);
   dirpath = g_path_get_dirname (path);
   r = g_mkdir_with_parents (dirpath, DIR_PERMS);
-	if (r < 0) {
+  if (r < 0)
+    {
       g_debug ("file_storage_print_data_save(): could not mkdir(\"%s\"): %s",
                dirpath, g_strerror (r));
       return r;
@@ -142,7 +153,8 @@ int file_storage_print_data_save(FpPrint *print)
 
   //fp_dbg("saving to %s", path);
   g_file_set_contents (path, buf, len, &err);
-	if (err) {
+  if (err)
+    {
       g_debug ("file_storage_print_data_save(): could not save '%s': %s",
                path, err->message);
       /* FIXME interpret error codes */
@@ -152,7 +164,8 @@ int file_storage_print_data_save(FpPrint *print)
   return 0;
 }
 
-static int load_from_file(char *path, FpPrint **print)
+static int
+load_from_file (char *path, FpPrint **print)
 {
   g_autoptr(GError) err = NULL;
   gsize length;
@@ -161,7 +174,8 @@ static int load_from_file(char *path, FpPrint **print)
 
   //fp_dbg("from %s", path);
   g_file_get_contents (path, &contents, &length, &err);
-	if (err) {
+  if (err)
+    {
       int r = err->code;
       /* FIXME interpret more error codes */
       if (r == G_FILE_ERROR_NOENT)
@@ -171,7 +185,8 @@ static int load_from_file(char *path, FpPrint **print)
     }
 
   new = fp_print_deserialize ((guchar *) contents, length, &err);
-	if (!new) {
+  if (!new)
+    {
       g_print ("Error deserializing data: %s", err->message);
       return -EIO;
     }
@@ -180,13 +195,15 @@ static int load_from_file(char *path, FpPrint **print)
   return 0;
 }
 
-int file_storage_print_data_load(FpDevice *dev,
+int
+file_storage_print_data_load (FpDevice   *dev,
                               FpFinger    finger,
                               const char *username,
                               FpPrint   **print)
 {
   g_autofree gchar *path = NULL;
   g_autofree gchar *base_store = NULL;
+
   g_autoptr(FpPrint) new = NULL;
   int r;
 
@@ -199,15 +216,15 @@ int file_storage_print_data_load(FpDevice *dev,
   if (r)
     return r;
 
-	if (!fp_print_compatible (new, dev)) {
+  if (!fp_print_compatible (new, dev))
     return -EINVAL;
-	}
 
   *print = g_steal_pointer (&new);
   return 0;
 }
 
-int file_storage_print_data_delete(FpDevice *dev, FpFinger finger, const char *username)
+int
+file_storage_print_data_delete (FpDevice *dev, FpFinger finger, const char *username)
 {
   g_autofree gchar *base_store = NULL;
   g_autofree gchar *path = NULL;
@@ -225,19 +242,23 @@ int file_storage_print_data_delete(FpDevice *dev, FpFinger finger, const char *u
   return g_unlink (path);
 }
 
-static GSList *scan_dev_storedir(char *devpath,
+static GSList *
+scan_dev_storedir (char   *devpath,
                    GSList *list)
 {
   g_autoptr(GError) err = NULL;
   const gchar *ent;
 
   GDir *dir = g_dir_open (devpath, 0, &err);
-	if (!dir) {
+
+  if (!dir)
+    {
       g_debug ("scan_dev_storedir(): opendir(\"%s\") failed: %s", devpath, err->message);
       return list;
     }
 
-	while ((ent = g_dir_read_name(dir))) {
+  while ((ent = g_dir_read_name (dir)))
+    {
       /* ent is an 1 hex character fp_finger code */
       guint64 val;
       gchar *endptr;
@@ -246,7 +267,8 @@ static GSList *scan_dev_storedir(char *devpath,
         continue;
 
       val = g_ascii_strtoull (ent, &endptr, 16);
-		if (endptr == ent || !FP_FINGER_IS_VALID(val)) {
+      if (endptr == ent || !FP_FINGER_IS_VALID (val))
+        {
           g_debug ("scan_dev_storedir(): skipping print file '%s'", ent);
           continue;
         }
@@ -258,7 +280,8 @@ static GSList *scan_dev_storedir(char *devpath,
   return list;
 }
 
-GSList *file_storage_discover_prints(FpDevice *dev, const char *username)
+GSList *
+file_storage_discover_prints (FpDevice *dev, const char *username)
 {
   GSList *list = NULL;
   g_autofree gchar *base_store = NULL;
@@ -278,18 +301,19 @@ GSList *file_storage_discover_prints(FpDevice *dev, const char *username)
   return list;
 }
 
-GSList *file_storage_discover_users(void)
+GSList *
+file_storage_discover_users (void)
 {
   g_autoptr(GError) err = NULL;
   GSList *list = NULL;
   const gchar *ent;
   GDir *dir = g_dir_open (get_storage_path (), 0, &err);
 
-	if (!dir) {
+  if (!dir)
     return list;
-	}
 
-	while ((ent = g_dir_read_name(dir))) {
+  while ((ent = g_dir_read_name (dir)))
+    {
       /* ent is a username */
       if (*ent == 0)
         continue;
@@ -301,13 +325,15 @@ GSList *file_storage_discover_users(void)
   return list;
 }
 
-int file_storage_init(void)
+int
+file_storage_init (void)
 {
   /* Nothing to do */
   return 0;
 }
 
-int file_storage_deinit(void)
+int
+file_storage_deinit (void)
 {
   g_clear_pointer (&storage_path, g_free);
   return 0;

src/file_storage.h

@@ -35,5 +35,6 @@ int file_storage_init(void);
 
 int file_storage_deinit (void);
 
-GSList *file_storage_discover_prints(FpDevice *dev, const char *username);
+GSList *file_storage_discover_prints (FpDevice   *dev,
+                                      const char *username);
 GSList *file_storage_discover_users (void);

src/fprintd.h

@@ -69,18 +69,21 @@ typedef enum {
 #define FPRINT_TYPE_MANAGER (fprint_manager_get_type ())
 G_DECLARE_FINAL_TYPE (FprintManager, fprint_manager, FPRINT, MANAGER, GObject)
 
-struct _FprintManager {
+struct _FprintManager
+{
   GObject parent;
 };
 
-FprintManager *fprint_manager_new (GDBusConnection *connection, gboolean no_timeout);
+FprintManager *fprint_manager_new (GDBusConnection *connection,
+                                   gboolean         no_timeout);
 
 /* Device */
 #define FPRINT_TYPE_DEVICE (fprint_device_get_type ())
 G_DECLARE_FINAL_TYPE (FprintDevice, fprint_device, FPRINT, DEVICE,
                       FprintDBusDeviceSkeleton)
 
-struct _FprintDevice {
+struct _FprintDevice
+{
   FprintDBusDeviceSkeleton parent;
 };
 

src/main.c

@@ -69,7 +69,8 @@ load_storage_module (const char *module_name)
       !g_module_symbol (module, "print_data_save", (gpointer *) &store.print_data_save) ||
       !g_module_symbol (module, "print_data_load", (gpointer *) &store.print_data_load) ||
       !g_module_symbol (module, "print_data_delete", (gpointer *) &store.print_data_delete) ||
-	    !g_module_symbol (module, "discover_prints", (gpointer *) &store.discover_prints)) {
+      !g_module_symbol (module, "discover_prints", (gpointer *) &store.discover_prints))
+    {
       g_module_close (module);
       return FALSE;
     }
@@ -84,13 +85,15 @@ load_conf (void)
 {
   g_autofree char *filename = NULL;
   g_autofree char *module_name = NULL;
+
   g_autoptr(GKeyFile) file = NULL;
   g_autoptr(GError) error = NULL;
 
   filename = g_build_filename (SYSCONFDIR, "fprintd.conf", NULL);
   file = g_key_file_new ();
   g_debug ("About to load configuration file '%s'", filename);
-	if (!g_key_file_load_from_file (file, filename, G_KEY_FILE_NONE, &error)) {
+  if (!g_key_file_load_from_file (file, filename, G_KEY_FILE_NONE, &error))
+    {
       g_warning ("Could not open \"%s\": %s\n", filename, error->message);
       return FALSE;
     }
@@ -99,7 +102,8 @@ load_conf (void)
   if (module_name == NULL)
     return FALSE;
 
-	if (g_str_equal (module_name, "file")) {
+  if (g_str_equal (module_name, "file"))
+    {
       set_storage_file ();
       return TRUE;
     }
@@ -113,7 +117,8 @@ static const GOptionEntry entries[] = {
   { NULL }
 };
 
-static gboolean sigterm_callback(gpointer data)
+static gboolean
+sigterm_callback (gpointer data)
 {
   GMainLoop *loop = data;
 
@@ -141,7 +146,8 @@ on_name_lost (GDBusConnection *connection,
   g_main_loop_quit (loop);
 }
 
-int main(int argc, char **argv)
+int
+main (int argc, char **argv)
 {
   g_autoptr(GOptionContext) context = NULL;
   g_autoptr(GMainLoop) loop = NULL;
@@ -159,12 +165,14 @@ int main(int argc, char **argv)
   context = g_option_context_new ("Fingerprint handler daemon");
   g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
 
-	if (g_option_context_parse (context, &argc, &argv, &error) == FALSE) {
+  if (g_option_context_parse (context, &argc, &argv, &error) == FALSE)
+    {
       g_warning ("couldn't parse command-line options: %s\n", error->message);
       return 1;
     }
 
-	if (g_fatal_warnings) {
+  if (g_fatal_warnings)
+    {
       GLogLevelFlags fatal_mask;
 
       fatal_mask = g_log_set_always_fatal (G_LOG_FATAL_MASK);
@@ -174,7 +182,8 @@ int main(int argc, char **argv)
 
   /* Obtain a connection to the system bus */
   connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
-	if (!G_IS_DBUS_CONNECTION (connection)) {
+  if (!G_IS_DBUS_CONNECTION (connection))
+    {
       g_warning ("Failed to open connection to bus: %s", error->message);
       return 1;
     }
@@ -211,4 +220,3 @@ int main(int argc, char **argv)
 
   return 0;
 }
-

src/manager.c

@@ -29,9 +29,11 @@
 
 static void fprint_manager_constructed (GObject *object);
 static gboolean fprint_manager_get_devices (FprintManager *manager,
-	GPtrArray **devices, GError **error);
+                                            GPtrArray    **devices,
+                                            GError       **error);
 static gboolean fprint_manager_get_default_device (FprintManager *manager,
-	const char **device, GError **error);
+                                                   const char   **device,
+                                                   GError       **error);
 
 typedef struct
 {
@@ -53,7 +55,8 @@ enum {
 
 static GParamSpec *properties[N_PROPS];
 
-static void fprint_manager_finalize(GObject *object)
+static void
+fprint_manager_finalize (GObject *object)
 {
   FprintManagerPrivate *priv = fprint_manager_get_instance_private (FPRINT_MANAGER (object));
 
@@ -66,46 +69,54 @@ static void fprint_manager_finalize(GObject *object)
 }
 
 static FprintDevice *
-fprint_dbus_object_skeleton_get_device (FprintDBusObjectSkeleton *object) {
+fprint_dbus_object_skeleton_get_device (FprintDBusObjectSkeleton *object)
+{
   FprintDevice *rdev;
 
   g_object_get (object, "device", &rdev, NULL);
   return rdev;
 }
 
-static void fprint_manager_set_property (GObject *object, guint property_id,
+static void
+fprint_manager_set_property (GObject *object, guint property_id,
                              const GValue *value, GParamSpec *pspec)
 {
   FprintManager *self = FPRINT_MANAGER (object);
   FprintManagerPrivate *priv = fprint_manager_get_instance_private (self);
 
-	switch (property_id) {
+  switch (property_id)
+    {
     case FPRINT_MANAGER_CONNECTION:
       priv->connection = g_value_dup_object (value);
       break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;
     }
 }
 
-static void fprint_manager_get_property (GObject *object, guint property_id,
+static void
+fprint_manager_get_property (GObject *object, guint property_id,
                              GValue *value, GParamSpec *pspec)
 {
   FprintManager *self = FPRINT_MANAGER (object);
   FprintManagerPrivate *priv = fprint_manager_get_instance_private (self);
 
-	switch (property_id) {
+  switch (property_id)
+    {
     case FPRINT_MANAGER_CONNECTION:
       g_value_set_object (value, priv->connection);
       break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;
     }
 }
 
-static void fprint_manager_class_init(FprintManagerClass *klass)
+static void
+fprint_manager_class_init (FprintManagerClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
@@ -125,7 +136,8 @@ static void fprint_manager_class_init(FprintManagerClass *klass)
   g_object_class_install_properties (object_class, N_PROPS, properties);
 }
 
-static gchar *get_device_path(FprintDevice *rdev)
+static gchar *
+get_device_path (FprintDevice *rdev)
 {
   return g_strdup_printf (FPRINT_SERVICE_PATH "/Device/%d",
                           _fprint_device_get_id (rdev));
@@ -144,11 +156,13 @@ fprint_manager_in_use_notified (FprintDevice *rdev, GParamSpec *spec, FprintMana
 {
   FprintManagerPrivate *priv = fprint_manager_get_instance_private (manager);
   guint num_devices_used = 0;
+
   g_autolist (GDBusObject) devices = NULL;
   GList *l;
   gboolean in_use;
 
-	if (priv->timeout_id > 0) {
+  if (priv->timeout_id > 0)
+    {
       g_source_remove (priv->timeout_id);
       priv->timeout_id = 0;
     }
@@ -157,7 +171,8 @@ fprint_manager_in_use_notified (FprintDevice *rdev, GParamSpec *spec, FprintMana
 
   devices = g_dbus_object_manager_get_objects (priv->object_manager);
 
-	for (l = devices; l != NULL; l = l->next) {
+  for (l = devices; l != NULL; l = l->next)
+    {
       g_autoptr(FprintDevice) dev = NULL;
       FprintDBusObjectSkeleton *object = l->data;
 
@@ -178,7 +193,8 @@ handle_get_devices (FprintManager *manager, GDBusMethodInvocation *invocation,
   g_autoptr(GPtrArray) devices = NULL;
   g_autoptr(GError) error = NULL;
 
-	if (!fprint_manager_get_devices (manager, &devices, &error)) {
+  if (!fprint_manager_get_devices (manager, &devices, &error))
+    {
       g_dbus_method_invocation_return_gerror (invocation, error);
       return TRUE;
     }
@@ -196,9 +212,11 @@ handle_get_default_device (FprintManager *manager,
                            FprintDBusManager     *skeleton)
 {
   const gchar *device;
+
   g_autoptr(GError) error = NULL;
 
-	if (!fprint_manager_get_default_device (manager, &device, &error)) {
+  if (!fprint_manager_get_default_device (manager, &device, &error))
+    {
       g_dbus_method_invocation_return_gerror (invocation, error);
       return TRUE;
     }
@@ -213,6 +231,7 @@ static void
 device_added_cb (FprintManager *manager, FpDevice *device, FpContext *context)
 {
   FprintManagerPrivate *priv = fprint_manager_get_instance_private (manager);
+
   g_autoptr(FprintDBusObjectSkeleton) object = NULL;
   g_autoptr(FprintDevice) rdev = NULL;
   g_autofree gchar *path = NULL;
@@ -236,12 +255,14 @@ static void
 device_removed_cb (FprintManager *manager, FpDevice *device, FpContext *context)
 {
   FprintManagerPrivate *priv = fprint_manager_get_instance_private (manager);
+
   g_autolist (FprintDBusObjectSkeleton) objects = NULL;
   GList *item;
 
   objects = g_dbus_object_manager_get_objects (priv->object_manager);
 
-	for (item = objects; item; item = item->next) {
+  for (item = objects; item; item = item->next)
+    {
       g_autoptr(FprintDevice) rdev = NULL;
       g_autoptr(FpDevice) dev = NULL;
       FprintDBusObjectSkeleton *object = item->data;
@@ -266,7 +287,8 @@ device_removed_cb (FprintManager *manager, FpDevice *device, FpContext *context)
   fprint_manager_in_use_notified (NULL, NULL, manager);
 }
 
-static void fprint_manager_constructed (GObject *object)
+static void
+fprint_manager_constructed (GObject *object)
 {
   FprintManager *manager = FPRINT_MANAGER (object);
   FprintManagerPrivate *priv = fprint_manager_get_instance_private (manager);
@@ -323,7 +345,8 @@ fprint_manager_init (FprintManager *manager)
 {
 }
 
-FprintManager *fprint_manager_new (GDBusConnection *connection, gboolean no_timeout)
+FprintManager *
+fprint_manager_new (GDBusConnection *connection, gboolean no_timeout)
 {
   FprintManagerPrivate *priv;
   GObject *object;
@@ -338,10 +361,12 @@ FprintManager *fprint_manager_new (GDBusConnection *connection, gboolean no_time
   return FPRINT_MANAGER (object);
 }
 
-static gboolean fprint_manager_get_devices(FprintManager *manager,
+static gboolean
+fprint_manager_get_devices (FprintManager *manager,
                             GPtrArray **devices, GError **error)
 {
   FprintManagerPrivate *priv = fprint_manager_get_instance_private (manager);
+
   g_autolist (FprintDBusObjectSkeleton) objects = NULL;
   GList *l;
   int num_open;
@@ -353,8 +378,10 @@ static gboolean fprint_manager_get_devices(FprintManager *manager,
   num_open = g_list_length (objects);
   devs = g_ptr_array_sized_new (num_open);
 
-	if (num_open > 0) {
+  if (num_open > 0)
-		for (l = objects; l != NULL; l = l->next) {
+    {
+      for (l = objects; l != NULL; l = l->next)
+        {
           g_autoptr(FprintDevice) rdev = NULL;
           FprintDBusObjectSkeleton *object = l->data;
           const char *path;
@@ -371,17 +398,20 @@ static gboolean fprint_manager_get_devices(FprintManager *manager,
   return TRUE;
 }
 
-static gboolean fprint_manager_get_default_device(FprintManager *manager,
+static gboolean
+fprint_manager_get_default_device (FprintManager *manager,
                                    const char **device, GError **error)
 {
   FprintManagerPrivate *priv = fprint_manager_get_instance_private (manager);
+
   g_autolist (FprintDBusObjectSkeleton) objects = NULL;
   int num_open;
 
   objects = g_dbus_object_manager_get_objects (priv->object_manager);
   num_open = g_list_length (objects);
 
-	if (num_open > 0) {
+  if (num_open > 0)
+    {
       g_autoptr(FprintDevice) rdev = NULL;
       FprintDBusObjectSkeleton *object = g_list_last (objects)->data;
 
@@ -389,7 +419,9 @@ static gboolean fprint_manager_get_default_device(FprintManager *manager,
       *device = g_dbus_interface_skeleton_get_object_path (
         G_DBUS_INTERFACE_SKELETON (rdev));
       return TRUE;
-	} else {
+    }
+  else
+    {
       g_set_error (error, FPRINT_ERROR, FPRINT_ERROR_NO_SUCH_DEVICE,
                    "No devices available");
       *device = NULL;
@@ -397,10 +429,13 @@ static gboolean fprint_manager_get_default_device(FprintManager *manager,
     }
 }
 
-GQuark fprint_error_quark (void)
+GQuark
+fprint_error_quark (void)
 {
   static volatile gsize quark = 0;
-	if (g_once_init_enter (&quark)) {
+
+  if (g_once_init_enter (&quark))
+    {
       g_autoptr(GEnumClass) errors_enum = NULL;
       GQuark domain;
       unsigned i;
@@ -408,7 +443,8 @@ GQuark fprint_error_quark (void)
       domain = g_quark_from_static_string ("fprintd-error-quark");
       errors_enum = g_type_class_ref (FPRINT_TYPE_ERROR);
 
-		for (i = 0; i < errors_enum->n_values; ++i) {
+      for (i = 0; i < errors_enum->n_values; ++i)
+        {
           GEnumValue *value = &errors_enum->values[i];
 
           g_dbus_error_register_error (domain, value->value,

src/storage.h

@@ -28,12 +28,14 @@ typedef int (*storage_print_data_load)(FpDevice   *dev,
 typedef int (*storage_print_data_delete)(FpDevice   *dev,
                                          FpFinger    finger,
                                          const char *username);
-typedef GSList *(*storage_discover_prints)(FpDevice *dev, const char *username);
+typedef GSList *(*storage_discover_prints)(FpDevice   *dev,
+                                           const char *username);
 typedef GSList *(*storage_discover_users)(void);
 typedef int (*storage_init)(void);
 typedef int (*storage_deinit)(void);
 
-struct storage {
+struct storage
+{
   storage_init              init;
   storage_deinit            deinit;
   storage_print_data_save   print_data_save;

tests/pam/test_pam_fprintd.py

@@ -86,6 +86,10 @@ class TestPamFprintd(dbusmock.DBusTestCase):
         self.device_mock = self.dbus_con.get_object('net.reactivated.Fprint', device_path)
         self.device_mock.SetEnrolledFingers('toto', ['left-little-finger', 'right-little-finger'])
 
+    def test_pam_no_device(self):
+        tc = pypamtest.TestCase(pypamtest.PAMTEST_AUTHENTICATE, expected_rv=PAM_AUTHINFO_UNAVAIL)
+        res = pypamtest.run_pamtest("toto", "fprintd-pam-test", [tc], [ 'unused' ])
+
     def test_pam_fprintd_identify_error(self):
         self.setup_device()
         script = [

utils/delete.c

@@ -26,12 +26,14 @@
 static FprintDBusManager *manager = NULL;
 static GDBusConnection *connection = NULL;
 
-static void create_manager(void)
+static void
+create_manager (void)
 {
   g_autoptr(GError) error = NULL;
 
   connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
-	if (connection == NULL) {
+  if (connection == NULL)
+    {
       g_print ("Failed to connect to session bus: %s\n", error->message);
       exit (1);
     }
@@ -41,55 +43,68 @@ static void create_manager(void)
                                                 "net.reactivated.Fprint",
                                                 "/net/reactivated/Fprint/Manager",
                                                 NULL, &error);
-	if (manager == NULL) {
+  if (manager == NULL)
+    {
       g_print ("Failed to get Fprintd manager: %s\n", error->message);
       exit (1);
     }
 }
 
-static void delete_fingerprints (FprintDBusDevice *dev, const char *username)
+static void
+delete_fingerprints (FprintDBusDevice *dev, const char *username)
 {
   g_autoptr(GError) error = NULL;
 
-	if (!fprint_dbus_device_call_claim_sync (dev, username, NULL, &error)) {
+  if (!fprint_dbus_device_call_claim_sync (dev, username, NULL, &error))
+    {
       g_print ("failed to claim device: %s\n", error->message);
       exit (1);
     }
 
   if (!fprint_dbus_device_call_delete_enrolled_fingers2_sync (dev, NULL,
-								    &error)) {
+                                                              &error))
+    {
       gboolean ignore_error = FALSE;
-		if (g_dbus_error_is_remote_error (error)) {
+      if (g_dbus_error_is_remote_error (error))
+        {
           g_autofree char *dbus_error =
             g_dbus_error_get_remote_error (error);
           if (g_str_equal (dbus_error,
-					 "net.reactivated.Fprint.Error.NoEnrolledPrints")) {
+                           "net.reactivated.Fprint.Error.NoEnrolledPrints"))
+            {
               g_print ("No fingerprints to delete on %s\n",
                        fprint_dbus_device_get_name (dev));
               ignore_error = TRUE;
             }
         }
-		if (!ignore_error) {
+      if (!ignore_error)
+        {
           g_print ("ListEnrolledFingers failed: %s\n",
                    error->message);
           exit (1);
-		} else {
+        }
+      else
+        {
           g_print ("No fingerprints to delete on %s\n",
                    fprint_dbus_device_get_name (dev));
         }
-	} else {
+    }
+  else
+    {
       g_print ("Fingerprints deleted on %s\n",
                fprint_dbus_device_get_name (dev));
     }
   g_clear_error (&error);
 
-	if (!fprint_dbus_device_call_release_sync (dev, NULL, &error)) {
+  if (!fprint_dbus_device_call_release_sync (dev, NULL, &error))
+    {
       g_print ("ReleaseDevice failed: %s\n", error->message);
       exit (1);
     }
 }
 
-static void process_devices(char **argv)
+static void
+process_devices (char **argv)
 {
   g_autoptr(GError) error = NULL;
   g_auto(GStrv) devices = NULL;
@@ -98,24 +113,28 @@ static void process_devices(char **argv)
   guint i;
 
   if (!fprint_dbus_manager_call_get_devices_sync (manager, &devices,
-							NULL, &error)) {
+                                                  NULL, &error))
+    {
       g_print ("Impossible to get devices: %s\n", error->message);
       exit (1);
     }
 
   num_devices = g_strv_length (devices);
-	if (num_devices == 0) {
+  if (num_devices == 0)
+    {
       g_print ("No devices available\n");
       exit (1);
     }
 
   g_print ("found %u devices\n", num_devices);
-	for (i = 0; devices[i] != NULL; i++) {
+  for (i = 0; devices[i] != NULL; i++)
+    {
       path = devices[i];
       g_print ("Device at %s\n", path);
     }
 
-	for (i = 0; devices[i] != NULL; i++) {
+  for (i = 0; devices[i] != NULL; i++)
+    {
       g_autoptr(FprintDBusDevice) dev = NULL;
       guint j;
 
@@ -133,13 +152,15 @@ static void process_devices(char **argv)
     }
 }
 
-int main(int argc, char **argv)
+int
+main (int argc, char **argv)
 {
   setlocale (LC_ALL, "");
 
   create_manager ();
 
-	if (argc < 2) {
+  if (argc < 2)
+    {
       g_print ("Usage: %s <username> [usernames...]\n", argv[0]);
       return 1;
     }
@@ -148,4 +169,3 @@ int main(int argc, char **argv)
 
   return 0;
 }
-

utils/enroll.c

@@ -33,12 +33,14 @@ static GDBusConnection *connection = NULL;
 static char *finger_name = NULL;
 static char **usernames = NULL;
 
-static void create_manager(void)
+static void
+create_manager (void)
 {
   g_autoptr(GError) error = NULL;
 
   connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
-	if (connection == NULL) {
+  if (connection == NULL)
+    {
       g_print ("Failed to connect to session bus: %s\n", error->message);
       exit (1);
     }
@@ -48,20 +50,23 @@ static void create_manager(void)
                                                 "net.reactivated.Fprint",
                                                 "/net/reactivated/Fprint/Manager",
                                                 NULL, &error);
-	if (manager == NULL) {
+  if (manager == NULL)
+    {
       g_print ("Failed to get Fprintd manager: %s\n", error->message);
       exit (1);
     }
 }
 
-static FprintDBusDevice *open_device (const char *username)
+static FprintDBusDevice *
+open_device (const char *username)
 {
   g_autoptr(FprintDBusDevice) dev = NULL;
   g_autoptr(GError) error = NULL;
   g_autofree char *path = NULL;
 
   if (!fprint_dbus_manager_call_get_default_device_sync (manager, &path,
-							       NULL, &error)) {
+                                                         NULL, &error))
+    {
       g_print ("Impossible to enroll: %s\n", error->message);
       exit (1);
     }
@@ -73,33 +78,39 @@ static FprintDBusDevice *open_device (const char *username)
                                            "net.reactivated.Fprint",
                                            path, NULL, &error);
 
-	if (error) {
+  if (error)
+    {
       g_print ("failed to connect to device: %s\n", error->message);
       exit (1);
     }
 
-	if (!fprint_dbus_device_call_claim_sync (dev, username, NULL, &error)) {
+  if (!fprint_dbus_device_call_claim_sync (dev, username, NULL, &error))
+    {
       g_print ("failed to claim device: %s\n", error->message);
       exit (1);
     }
   return g_steal_pointer (&dev);
 }
 
-static void enroll_result(GObject *object, const char *result, gboolean done, void *user_data)
+static void
+enroll_result (GObject *object, const char *result, gboolean done, void *user_data)
 {
   gboolean *enroll_completed = user_data;
+
   g_print ("Enroll result: %s\n", result);
   if (done != FALSE)
     *enroll_completed = TRUE;
 }
 
-static void proxy_signal_cb (GDBusProxy *proxy,
+static void
+proxy_signal_cb (GDBusProxy  *proxy,
                  const gchar *sender_name,
                  const gchar *signal_name,
                  GVariant    *parameters,
                  gpointer     user_data)
 {
-	if (g_str_equal (signal_name, "EnrollStatus")) {
+  if (g_str_equal (signal_name, "EnrollStatus"))
+    {
       const gchar *result;
       gboolean done;
 
@@ -108,7 +119,8 @@ static void proxy_signal_cb (GDBusProxy *proxy,
     }
 }
 
-static void do_enroll (FprintDBusDevice *dev)
+static void
+do_enroll (FprintDBusDevice *dev)
 {
   g_autoptr(GError) error = NULL;
   gboolean enroll_completed = FALSE;
@@ -119,18 +131,22 @@ static void do_enroll (FprintDBusDevice *dev)
                     &enroll_completed);
 
   found = FALSE;
-	for (i = 0; fingers[i].dbus_name != NULL; i++) {
+  for (i = 0; fingers[i].dbus_name != NULL; i++)
-		if (g_strcmp0 (fingers[i].dbus_name, finger_name) == 0) {
+    {
+      if (g_strcmp0 (fingers[i].dbus_name, finger_name) == 0)
+        {
           found = TRUE;
           break;
         }
     }
-	if (!found) {
+  if (!found)
+    {
       g_autoptr(GString) s = NULL;
 
       s = g_string_new (NULL);
       g_string_append_printf (s, "Invalid finger name '%s'. Name must be one of ", finger_name);
-		for (i = 0; fingers[i].dbus_name != NULL; i++) {
+      for (i = 0; fingers[i].dbus_name != NULL; i++)
+        {
           g_string_append_printf (s, "%s", fingers[i].dbus_name);
           if (fingers[i + 1].dbus_name != NULL)
             g_string_append (s, ", ");
@@ -141,7 +157,8 @@ static void do_enroll (FprintDBusDevice *dev)
 
   g_print ("Enrolling %s finger.\n", finger_name);
   if (!fprint_dbus_device_call_enroll_start_sync (dev, finger_name, NULL,
-							&error)) {
+                                                  &error))
+    {
       g_print ("EnrollStart failed: %s\n", error->message);
       exit (1);
     }
@@ -151,16 +168,19 @@ static void do_enroll (FprintDBusDevice *dev)
 
   g_signal_handlers_disconnect_by_func (dev, proxy_signal_cb, &enroll_result);
 
-	if (!fprint_dbus_device_call_enroll_stop_sync (dev, NULL, &error)) {
+  if (!fprint_dbus_device_call_enroll_stop_sync (dev, NULL, &error))
+    {
       g_print ("VerifyStop failed: %s\n", error->message);
       exit (1);
     }
 }
 
-static void release_device (FprintDBusDevice *dev)
+static void
+release_device (FprintDBusDevice *dev)
 {
   g_autoptr(GError) error = NULL;
-	if (!fprint_dbus_device_call_release_sync (dev, NULL, &error)) {
+  if (!fprint_dbus_device_call_release_sync (dev, NULL, &error))
+    {
       g_print ("ReleaseDevice failed: %s\n", error->message);
       exit (1);
     }
@@ -172,10 +192,12 @@ static const GOptionEntry entries[] = {
   { NULL }
 };
 
-int main(int argc, char **argv)
+int
+main (int argc, char **argv)
 {
   g_autoptr(FprintDBusDevice) dev = NULL;
   GOptionContext *context;
+
   g_autoptr(GError) err = NULL;
 
   setlocale (LC_ALL, "");
@@ -183,7 +205,8 @@ int main(int argc, char **argv)
   context = g_option_context_new ("Enroll a fingerprint");
   g_option_context_add_main_entries (context, entries, NULL);
 
-	if (g_option_context_parse (context, &argc, &argv, &err) == FALSE) {
+  if (g_option_context_parse (context, &argc, &argv, &err) == FALSE)
+    {
       g_print ("couldn't parse command-line options: %s\n", err->message);
       return 1;
     }
@@ -200,4 +223,3 @@ int main(int argc, char **argv)
   g_strfreev (usernames);
   return 0;
 }
-

utils/list.c

@@ -26,12 +26,14 @@
 static FprintDBusManager *manager = NULL;
 static GDBusConnection *connection = NULL;
 
-static void create_manager(void)
+static void
+create_manager (void)
 {
   g_autoptr(GError) error = NULL;
 
   connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
-	if (connection == NULL) {
+  if (connection == NULL)
+    {
       g_print ("Failed to connect to session bus: %s\n", error->message);
       exit (1);
     }
@@ -41,13 +43,15 @@ static void create_manager(void)
                                                 "net.reactivated.Fprint",
                                                 "/net/reactivated/Fprint/Manager",
                                                 NULL, &error);
-	if (manager == NULL) {
+  if (manager == NULL)
+    {
       g_print ("Failed to get Fprintd manager: %s\n", error->message);
       exit (1);
     }
 }
 
-static void list_fingerprints (FprintDBusDevice *dev, const char *username)
+static void
+list_fingerprints (FprintDBusDevice *dev, const char *username)
 {
   g_autoptr(GError) error = NULL;
   g_auto(GStrv) fingers = NULL;
@@ -55,24 +59,27 @@ static void list_fingerprints (FprintDBusDevice *dev, const char *username)
 
   if (!fprint_dbus_device_call_list_enrolled_fingers_sync (dev, username,
                                                            &fingers, NULL,
-								 &error)) {
+                                                           &error))
+    {
       gboolean ignore_error = FALSE;
-		if (g_dbus_error_is_remote_error (error)) {
+      if (g_dbus_error_is_remote_error (error))
+        {
           g_autofree char *dbus_error =
             g_dbus_error_get_remote_error (error);
           if (g_str_equal (dbus_error,
-					 "net.reactivated.Fprint.Error.NoEnrolledPrints")) {
+                           "net.reactivated.Fprint.Error.NoEnrolledPrints"))
             ignore_error = TRUE;
         }
-		}
 
-		if (!ignore_error) {
+      if (!ignore_error)
+        {
           g_print ("ListEnrolledFingers failed: %s\n", error->message);
           exit (1);
         }
     }
 
-	if (fingers == NULL || g_strv_length (fingers) == 0) {
+  if (fingers == NULL || g_strv_length (fingers) == 0)
+    {
       g_print ("User %s has no fingers enrolled for %s.\n", username,
                fprint_dbus_device_get_name (dev));
       return;
@@ -83,12 +90,12 @@ static void list_fingerprints (FprintDBusDevice *dev, const char *username)
            fprint_dbus_device_get_name (dev),
            fprint_dbus_device_get_scan_type (dev));
 
-	for (i = 0; fingers[i] != NULL; i++) {
+  for (i = 0; fingers[i] != NULL; i++)
     g_print (" - #%d: %s\n", i, fingers[i]);
 }
-}
 
-static void process_devices(char **argv)
+static void
+process_devices (char **argv)
 {
   g_auto(GStrv) devices = NULL;
   g_autoptr(GError) error = NULL;
@@ -97,24 +104,28 @@ static void process_devices(char **argv)
   guint i;
 
   if (!fprint_dbus_manager_call_get_devices_sync (manager, &devices, NULL,
-							&error)) {
+                                                  &error))
+    {
       g_print ("Impossible to get devices: %s\n", error->message);
       exit (1);
     }
 
   num_devices = g_strv_length (devices);
-	if (num_devices == 0) {
+  if (num_devices == 0)
+    {
       g_print ("No devices available\n");
       exit (1);
     }
 
   g_print ("found %u devices\n", num_devices);
-	for (i = 0; devices[i] != NULL; i++) {
+  for (i = 0; devices[i] != NULL; i++)
+    {
       path = devices[i];
       g_print ("Device at %s\n", path);
     }
 
-	for (i = 0; devices[i] != NULL; i++) {
+  for (i = 0; devices[i] != NULL; i++)
+    {
       g_autoptr(FprintDBusDevice) dev = NULL;
       guint j;
 
@@ -132,13 +143,15 @@ static void process_devices(char **argv)
     }
 }
 
-int main(int argc, char **argv)
+int
+main (int argc, char **argv)
 {
   setlocale (LC_ALL, "");
 
   create_manager ();
 
-	if (argc < 2) {
+  if (argc < 2)
+    {
       g_print ("Usage: %s <username> [usernames...]\n", argv[0]);
       return 1;
     }
@@ -147,4 +160,3 @@ int main(int argc, char **argv)
 
   return 0;
 }
-

utils/verify.c

@@ -31,12 +31,14 @@ static char *finger_name = NULL;
 static gboolean g_fatal_warnings = FALSE;
 static char **usernames = NULL;
 
-static void create_manager(void)
+static void
+create_manager (void)
 {
   g_autoptr(GError) error = NULL;
 
   connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
-	if (connection == NULL) {
+  if (connection == NULL)
+    {
       g_print ("Failed to connect to session bus: %s\n", error->message);
       exit (1);
     }
@@ -46,20 +48,23 @@ static void create_manager(void)
                                                 "net.reactivated.Fprint",
                                                 "/net/reactivated/Fprint/Manager",
                                                 NULL, &error);
-	if (manager == NULL) {
+  if (manager == NULL)
+    {
       g_print ("Failed to get Fprintd manager: %s\n", error->message);
       exit (1);
     }
 }
 
-static FprintDBusDevice *open_device (const char *username)
+static FprintDBusDevice *
+open_device (const char *username)
 {
   g_autoptr(FprintDBusDevice) dev = NULL;
   g_autoptr(GError) error = NULL;
   g_autofree char *path = NULL;
 
   if (!fprint_dbus_manager_call_get_default_device_sync (manager, &path,
-							       NULL, &error)) {
+                                                         NULL, &error))
+    {
       g_print ("Impossible to verify: %s\n", error->message);
       exit (1);
     }
@@ -71,12 +76,14 @@ static FprintDBusDevice *open_device (const char *username)
                                            "net.reactivated.Fprint",
                                            path, NULL, &error);
 
-	if (error) {
+  if (error)
+    {
       g_print ("failed to connect to device: %s\n", error->message);
       exit (1);
     }
 
-	if (!fprint_dbus_device_call_claim_sync (dev, username, NULL, &error)) {
+  if (!fprint_dbus_device_call_claim_sync (dev, username, NULL, &error))
+    {
       g_print ("failed to claim device: %s\n", error->message);
       exit (1);
     }
@@ -84,7 +91,8 @@ static FprintDBusDevice *open_device (const char *username)
   return g_steal_pointer (&dev);
 }
 
-static void find_finger (FprintDBusDevice *dev, const char *username)
+static void
+find_finger (FprintDBusDevice *dev, const char *username)
 {
   g_autoptr(GError) error = NULL;
   g_auto(GStrv) fingers = NULL;
@@ -92,54 +100,60 @@ static void find_finger (FprintDBusDevice *dev, const char *username)
 
   if (!fprint_dbus_device_call_list_enrolled_fingers_sync (dev, username,
                                                            &fingers,
-								 NULL, &error)) {
+                                                           NULL, &error))
+    {
       g_print ("ListEnrolledFingers failed: %s\n", error->message);
       exit (1);
     }
 
-	if (fingers == NULL || g_strv_length (fingers) == 0) {
+  if (fingers == NULL || g_strv_length (fingers) == 0)
+    {
       g_print ("No fingers enrolled for this device.\n");
       exit (1);
     }
 
   g_print ("Listing enrolled fingers:\n");
-	for (i = 0; fingers[i] != NULL; i++) {
+  for (i = 0; fingers[i] != NULL; i++)
     g_print (" - #%d: %s\n", i, fingers[i]);
-	}
 
   if (finger_name && !g_str_equal (finger_name, "any") &&
-	    !g_strv_contains ((const char **) fingers, finger_name)) {
+      !g_strv_contains ((const char **) fingers, finger_name))
+    {
       g_print ("Finger '%s' not enrolled for user %s.\n", finger_name,
                username);
       g_free (finger_name);
       exit (1);
     }
 
-	if (finger_name == NULL) {
+  if (finger_name == NULL)
     finger_name = g_strdup (fingers[0]);
 }
-}
 
-struct VerifyState {
+struct VerifyState
+{
   GError  *error;
   gboolean started;
   gboolean completed;
 };
 
-static void verify_result(GObject *object, const char *result, gboolean done, void *user_data)
+static void
+verify_result (GObject *object, const char *result, gboolean done, void *user_data)
 {
   struct VerifyState *verify_state = user_data;
+
   g_print ("Verify result: %s (%s)\n", result, done ? "done" : "not done");
   if (done != FALSE)
     verify_state->completed = TRUE;
 }
 
-static void verify_finger_selected(GObject *object, const char *name, void *user_data)
+static void
+verify_finger_selected (GObject *object, const char *name, void *user_data)
 {
   g_print ("Verifying: %s\n", name);
 }
 
-static void verify_started_cb (GObject *obj,
+static void
+verify_started_cb (GObject      *obj,
                    GAsyncResult *res,
                    gpointer      user_data)
 {
@@ -149,7 +163,8 @@ static void verify_started_cb (GObject *obj,
     verify_state->started = TRUE;
 }
 
-static void proxy_signal_cb (GDBusProxy *proxy,
+static void
+proxy_signal_cb (GDBusProxy  *proxy,
                  const gchar *sender_name,
                  const gchar *signal_name,
                  GVariant    *parameters,
@@ -160,13 +175,16 @@ static void proxy_signal_cb (GDBusProxy *proxy,
   if (!verify_state->started)
     return;
 
-	if (g_str_equal (signal_name, "VerifyStatus")) {
+  if (g_str_equal (signal_name, "VerifyStatus"))
+    {
       const gchar *result;
       gboolean done;
 
       g_variant_get (parameters, "(&sb)", &result, &done);
       verify_result (G_OBJECT (proxy), result, done, user_data);
-	} else if (g_str_equal (signal_name, "VerifyFingerSelected")) {
+    }
+  else if (g_str_equal (signal_name, "VerifyFingerSelected"))
+    {
       const gchar *name;
 
       g_variant_get (parameters, "(&s)", &name);
@@ -174,7 +192,8 @@ static void proxy_signal_cb (GDBusProxy *proxy,
     }
 }
 
-static void do_verify (FprintDBusDevice *dev)
+static void
+do_verify (FprintDBusDevice *dev)
 {
   g_autoptr(GError) error = NULL;
   struct VerifyState verify_state = { 0 };
@@ -201,7 +220,8 @@ static void do_verify (FprintDBusDevice *dev)
   while (!verify_state.started && !verify_state.error)
     g_main_context_iteration (NULL, TRUE);
 
-	if (verify_state.error) {
+  if (verify_state.error)
+    {
       g_print ("VerifyStart failed: %s\n", verify_state.error->message);
       g_clear_error (&verify_state.error);
       exit (1);
@@ -216,16 +236,19 @@ static void do_verify (FprintDBusDevice *dev)
   g_signal_handlers_disconnect_by_func (dev, proxy_signal_cb,
                                         &verify_state);
 
-	if (!fprint_dbus_device_call_verify_stop_sync (dev, NULL, &error)) {
+  if (!fprint_dbus_device_call_verify_stop_sync (dev, NULL, &error))
+    {
       g_print ("VerifyStop failed: %s\n", error->message);
       exit (1);
     }
 }
 
-static void release_device (FprintDBusDevice *dev)
+static void
+release_device (FprintDBusDevice *dev)
 {
   g_autoptr(GError) error = NULL;
-	if (!fprint_dbus_device_call_release_sync (dev, NULL, &error)) {
+  if (!fprint_dbus_device_call_release_sync (dev, NULL, &error))
+    {
       g_print ("ReleaseDevice failed: %s\n", error->message);
       exit (1);
     }
@@ -238,7 +261,8 @@ static const GOptionEntry entries[] = {
   { NULL }
 };
 
-int main(int argc, char **argv)
+int
+main (int argc, char **argv)
 {
   g_autoptr(FprintDBusDevice) dev = NULL;
   g_autoptr(GError) err = NULL;
@@ -250,18 +274,19 @@ int main(int argc, char **argv)
   context = g_option_context_new ("Verify a fingerprint");
   g_option_context_add_main_entries (context, entries, NULL);
 
-	if (g_option_context_parse (context, &argc, &argv, &err) == FALSE) {
+  if (g_option_context_parse (context, &argc, &argv, &err) == FALSE)
+    {
       g_print ("couldn't parse command-line options: %s\n", err->message);
       return 1;
     }
 
-	if (usernames == NULL) {
+  if (usernames == NULL)
     username = "";
-	} else {
+  else
     username = usernames[0];
-	}
 
-	if (g_fatal_warnings) {
+  if (g_fatal_warnings)
+    {
       GLogLevelFlags fatal_mask;
 
       fatal_mask = g_log_set_always_fatal (G_LOG_FATAL_MASK);
@@ -277,4 +302,3 @@ int main(int argc, char **argv)
   release_device (dev);
   return 0;
 }
-