From c1f8581ec93d4e7d32f3880524cb1d775020d5b9 Mon Sep 17 00:00:00 2001 From: Daniel Drake Date: Sat, 1 Dec 2007 13:00:33 +0000 Subject: [PATCH] Cleanup discover_device in examples Andrei Tchijov pointed out that the discover_device() function is written in a strange way. --- examples/enroll.c | 17 +++++++---------- examples/img_capture.c | 17 +++++++---------- examples/img_capture_continuous.c | 19 ++++++++----------- examples/verify.c | 17 +++++++---------- examples/verify_live.c | 17 +++++++---------- 5 files changed, 36 insertions(+), 51 deletions(-) diff --git a/examples/enroll.c b/examples/enroll.c index 2031938..7d07788 100644 --- a/examples/enroll.c +++ b/examples/enroll.c @@ -26,16 +26,13 @@ struct fp_dscv_dev *discover_device(struct fp_dscv_dev **discovered_devs) { - struct fp_dscv_dev *ddev = NULL; - int i; - - for (i = 0; ddev = discovered_devs[i]; i++) { - struct fp_driver *drv = fp_dscv_dev_get_driver(ddev); - printf("Found device claimed by %s driver\n", - fp_driver_get_full_name(drv)); - return ddev; - } - + struct fp_dscv_dev *ddev = discovered_devs[0]; + struct fp_driver *drv; + if (!ddev) + return NULL; + + drv = fp_dscv_dev_get_driver(ddev); + printf("Found device claimed by %s driver\n", fp_driver_get_full_name(drv)); return ddev; } diff --git a/examples/img_capture.c b/examples/img_capture.c index ea494c8..d45b8b8 100644 --- a/examples/img_capture.c +++ b/examples/img_capture.c @@ -24,16 +24,13 @@ struct fp_dscv_dev *discover_device(struct fp_dscv_dev **discovered_devs) { - struct fp_dscv_dev *ddev = NULL; - int i; - - for (i = 0; ddev = discovered_devs[i]; i++) { - struct fp_driver *drv = fp_dscv_dev_get_driver(ddev); - printf("Found device claimed by %s driver\n", - fp_driver_get_full_name(drv)); - return ddev; - } - + struct fp_dscv_dev *ddev = discovered_devs[0]; + struct fp_driver *drv; + if (!ddev) + return NULL; + + drv = fp_dscv_dev_get_driver(ddev); + printf("Found device claimed by %s driver\n", fp_driver_get_full_name(drv)); return ddev; } diff --git a/examples/img_capture_continuous.c b/examples/img_capture_continuous.c index 0f1644e..752f710 100644 --- a/examples/img_capture_continuous.c +++ b/examples/img_capture_continuous.c @@ -116,18 +116,15 @@ static void QueryXv() printf("No suitable Xv adaptor found\n"); } -static struct fp_dscv_dev *discover_device(struct fp_dscv_dev **discovered_devs) +struct fp_dscv_dev *discover_device(struct fp_dscv_dev **discovered_devs) { - struct fp_dscv_dev *ddev = NULL; - int i; - - for (i = 0; ddev = discovered_devs[i]; i++) { - struct fp_driver *drv = fp_dscv_dev_get_driver(ddev); - printf("Found device claimed by %s driver\n", - fp_driver_get_full_name(drv)); - return ddev; - } - + struct fp_dscv_dev *ddev = discovered_devs[0]; + struct fp_driver *drv; + if (!ddev) + return NULL; + + drv = fp_dscv_dev_get_driver(ddev); + printf("Found device claimed by %s driver\n", fp_driver_get_full_name(drv)); return ddev; } diff --git a/examples/verify.c b/examples/verify.c index af4327f..1e1dd4f 100644 --- a/examples/verify.c +++ b/examples/verify.c @@ -26,16 +26,13 @@ struct fp_dscv_dev *discover_device(struct fp_dscv_dev **discovered_devs) { - struct fp_dscv_dev *ddev = NULL; - int i; - - for (i = 0; ddev = discovered_devs[i]; i++) { - struct fp_driver *drv = fp_dscv_dev_get_driver(ddev); - printf("Found device claimed by %s driver\n", - fp_driver_get_full_name(drv)); - return ddev; - } - + struct fp_dscv_dev *ddev = discovered_devs[0]; + struct fp_driver *drv; + if (!ddev) + return NULL; + + drv = fp_dscv_dev_get_driver(ddev); + printf("Found device claimed by %s driver\n", fp_driver_get_full_name(drv)); return ddev; } diff --git a/examples/verify_live.c b/examples/verify_live.c index 0e1db6d..9a7b6a9 100644 --- a/examples/verify_live.c +++ b/examples/verify_live.c @@ -25,16 +25,13 @@ struct fp_dscv_dev *discover_device(struct fp_dscv_dev **discovered_devs) { - struct fp_dscv_dev *ddev = NULL; - int i; - - for (i = 0; ddev = discovered_devs[i]; i++) { - struct fp_driver *drv = fp_dscv_dev_get_driver(ddev); - printf("Found device claimed by %s driver\n", - fp_driver_get_full_name(drv)); - return ddev; - } - + struct fp_dscv_dev *ddev = discovered_devs[0]; + struct fp_driver *drv; + if (!ddev) + return NULL; + + drv = fp_dscv_dev_get_driver(ddev); + printf("Found device claimed by %s driver\n", fp_driver_get_full_name(drv)); return ddev; }