The start of camera_get_config returns immediately if

check_readiness() returns 0, so checking the cached_ready
flag again is not required

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>



git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14151 67ed7778-7388-44ab-90cf-0a291f65f57c

1 files changed, 45 insertions, 72 deletions

diff --git a/camlibs/canon/library.c b/camlibs/canon/library.c
index fdf078bc5..f600adad8 100644
--- a/camlibs/canon/library.c
+++ b/camlibs/canon/library.c
@@ -1634,11 +1634,9 @@ camera_get_config (Camera *camera, CameraWidget **window, GPContext *context)
 
 	/* Get the camera's current ISO Speed setting */
 	iso = -1;
-	if (camera->pl->cached_ready == 1) {
-		res = canon_int_get_release_params(camera, context);
-		if (res == GP_OK) 
-			iso = camera->pl->release_params[ISO_INDEX];
-	}
+	res = canon_int_get_release_params(camera, context);
+	if (res == GP_OK) 
+		iso = camera->pl->release_params[ISO_INDEX];
 
 	/* Map it to the list of choices */
 	i = 0;
@@ -1668,11 +1666,9 @@ camera_get_config (Camera *camera, CameraWidget **window, GPContext *context)
 
 	/* Get the camera's current shooting mode setting */
 	shooting_mode = -1;
-	if (camera->pl->cached_ready == 1) {
-		res = canon_int_get_release_params(camera, context);
-		if (res == GP_OK)
-			shooting_mode = camera->pl->release_params[SHOOTING_MODE_INDEX];
-	}
+	res = canon_int_get_release_params(camera, context);
+	if (res == GP_OK)
+		shooting_mode = camera->pl->release_params[SHOOTING_MODE_INDEX];
 
 	/* Map it to the list of choices */
 	i = 0;
@@ -1702,11 +1698,9 @@ camera_get_config (Camera *camera, CameraWidget **window, GPContext *context)
 
 	/* Get the camera's current shutter speed setting */
 	shutter_speed = -1;
-	if (camera->pl->cached_ready == 1) {
-		res = canon_int_get_release_params(camera, context);
-		if (res == GP_OK) 
-			shutter_speed = camera->pl->release_params[SHUTTERSPEED_INDEX];
-	}
+	res = canon_int_get_release_params(camera, context);
+	if (res == GP_OK) 
+		shutter_speed = camera->pl->release_params[SHUTTERSPEED_INDEX];
 
 	/* Map it to the list of choices */
 	i = 0;
@@ -1748,11 +1742,9 @@ camera_get_config (Camera *camera, CameraWidget **window, GPContext *context)
 
 	/* Get the camera's current aperture setting */
 	aperture = -1;
-	if (camera->pl->cached_ready == 1) {
-		res = canon_int_get_release_params(camera, context);
-		if (res == GP_OK) 
-			aperture = camera->pl->release_params[APERTURE_INDEX];
-	}
+	res = canon_int_get_release_params(camera, context);
+	if (res == GP_OK) 
+		aperture = camera->pl->release_params[APERTURE_INDEX];
 
 	/* Map it to the list of choices */
 	i = 0;
@@ -1781,11 +1773,9 @@ camera_get_config (Camera *camera, CameraWidget **window, GPContext *context)
 
 	/* Get the camera's current exposure compensation setting */
 	expbias = -1;
-	if (camera->pl->cached_ready == 1) {
-		res = canon_int_get_release_params(camera, context);
-		if (res == GP_OK) 
-			expbias = camera->pl->release_params[EXPOSUREBIAS_INDEX];
-	}
+	res = canon_int_get_release_params(camera, context);
+	if (res == GP_OK) 
+		expbias = camera->pl->release_params[EXPOSUREBIAS_INDEX];
 
 	/* Map it to the list of choices */
 	i = 0;
@@ -1814,13 +1804,11 @@ camera_get_config (Camera *camera, CameraWidget **window, GPContext *context)
 
 	/* Get the camera's current image format setting */
 	res_byte1 = res_byte2 = res_byte3 = -1;
-	if (camera->pl->cached_ready == 1) {
-		res = canon_int_get_release_params (camera, context);
-		if (res == GP_OK) {
-			res_byte1 = camera->pl->release_params[IMAGE_FORMAT_1_INDEX];
-			res_byte2 = camera->pl->release_params[IMAGE_FORMAT_2_INDEX];
-			res_byte3 = camera->pl->release_params[IMAGE_FORMAT_3_INDEX];
-		}
+	res = canon_int_get_release_params (camera, context);
+	if (res == GP_OK) {
+		res_byte1 = camera->pl->release_params[IMAGE_FORMAT_1_INDEX];
+		res_byte2 = camera->pl->release_params[IMAGE_FORMAT_2_INDEX];
+		res_byte3 = camera->pl->release_params[IMAGE_FORMAT_3_INDEX];
 	}
 
 	/* Map it to the list of choices */
@@ -1853,11 +1841,9 @@ camera_get_config (Camera *camera, CameraWidget **window, GPContext *context)
 
 	/* Get the camera's current focus mode setting */
 	focus_mode = -1;
-	if (camera->pl->cached_ready == 1) {
-		res = canon_int_get_release_params(camera, context);
-		if (res == GP_OK) 
-			focus_mode = camera->pl->release_params[FOCUS_MODE_INDEX];
-	}
+	res = canon_int_get_release_params(camera, context);
+	if (res == GP_OK) 
+		focus_mode = camera->pl->release_params[FOCUS_MODE_INDEX];
 
 	/* Map it to the list of choices */
 	i = 0;
@@ -1887,11 +1873,9 @@ camera_get_config (Camera *camera, CameraWidget **window, GPContext *context)
 
 	/* Get the camera's current flash mode setting */
 	flash_mode = -1;
-	if (camera->pl->cached_ready == 1) {
-		res = canon_int_get_release_params(camera, context);
-		if (res == GP_OK) 
-			flash_mode = camera->pl->release_params[FLASH_INDEX];
-	}
+	res = canon_int_get_release_params(camera, context);
+	if (res == GP_OK) 
+		flash_mode = camera->pl->release_params[FLASH_INDEX];
 
 	/* Map it to the list of choices */
 	i = 0;
@@ -1921,11 +1905,9 @@ camera_get_config (Camera *camera, CameraWidget **window, GPContext *context)
 
 	/* Get the camera's current beep setting */
 	beep_mode = -1;
-	if (camera->pl->cached_ready == 1) {
-		res = canon_int_get_release_params(camera, context);
-		if (res == GP_OK) 
-			beep_mode = camera->pl->release_params[BEEP_INDEX];
-	}
+	res = canon_int_get_release_params(camera, context);
+	if (res == GP_OK) 
+		beep_mode = camera->pl->release_params[BEEP_INDEX];
 
 	/* Map it to the list of choices */
 	i = 0;
@@ -1975,17 +1957,13 @@ camera_get_config (Camera *camera, CameraWidget **window, GPContext *context)
 
 	gp_widget_new (GP_WIDGET_TEXT, _("Date and Time"), &t);
 	gp_widget_set_name (t, "datetime");
-	if (camera->pl->cached_ready == 1) {
-		res = canon_int_get_time (camera, &camtime, context);
-		if (res == GP_OK) {
-			strftime (formatted_camera_time, sizeof (formatted_camera_time),
+	res = canon_int_get_time (camera, &camtime, context);
+	if (res == GP_OK) {
+		strftime (formatted_camera_time, sizeof (formatted_camera_time),
                           "%Y-%m-%d %H:%M:%S", gmtime (&camtime));
-			gp_widget_set_value (t, formatted_camera_time);
-		} else {
-			gp_widget_set_value (t, _("Error"));
-		}
+		gp_widget_set_value (t, formatted_camera_time);
 	} else {
-		gp_widget_set_value (t, _("Unavailable"));
+		gp_widget_set_value (t, _("Error"));
 	}
 	gp_widget_append (section, t);
 
@@ -1996,23 +1974,18 @@ camera_get_config (Camera *camera, CameraWidget **window, GPContext *context)
 	gp_widget_set_value (t, firm);
 	gp_widget_append (section, t);
 
-	if (camera->pl->cached_ready == 1) {
-		canon_get_batt_status (camera, &pwr_status, &pwr_source, context);
+	canon_get_batt_status (camera, &pwr_status, &pwr_source, context);
 
-		if (pwr_status == CAMERA_POWER_OK || pwr_status == CAMERA_POWER_BAD)
-			snprintf (power_str, sizeof (power_str), "%s (%s)",
-				  ((pwr_source & CAMERA_MASK_BATTERY) ==
-				   0) ? _("AC adapter") : _("on battery"),
-				  pwr_status ==
-				  CAMERA_POWER_OK ? _("power OK") : _("power bad"));
-		else
-			snprintf (power_str, sizeof (power_str), "%s - %i",
-				  ((pwr_source & CAMERA_MASK_BATTERY) ==
-				   0) ? _("AC adapter") : _("on battery"), pwr_status);
-	} else {
-		strncpy (power_str, _("Unavailable"), sizeof (power_str) - 1);
-		power_str[sizeof (power_str) - 1] = 0;
-	}
+	if (pwr_status == CAMERA_POWER_OK || pwr_status == CAMERA_POWER_BAD)
+		snprintf (power_str, sizeof (power_str), "%s (%s)",
+			  ((pwr_source & CAMERA_MASK_BATTERY) ==
+			   0) ? _("AC adapter") : _("on battery"),
+			  pwr_status ==
+			  CAMERA_POWER_OK ? _("power OK") : _("power bad"));
+	else
+		snprintf (power_str, sizeof (power_str), "%s - %i",
+			  ((pwr_source & CAMERA_MASK_BATTERY) ==
+			   0) ? _("AC adapter") : _("on battery"), pwr_status);
 
 	gp_widget_new (GP_WIDGET_TEXT, _("Power"), &t);
 	gp_widget_set_name (t, "power");