- better error handling and minor changes in photobox.c

[photobox.git] / src / photobox_photo.c

diff --git a/src/photobox_photo.c b/src/photobox_photo.c
index 87bc9ded8bfa40e79eaca629738abe3e9c140a9e..a13ac6ca70f338aec9e71a940aa8ceb2b695b29b 100644 (file)
--- a/src/photobox_photo.c
+++ b/src/photobox_photo.c
@@ -1,3 +1,5 @@
+// Copyright (C) 2019 Jaslo Ziska
+

 #include "photobox_photo.h"
 
 #include <stdio.h>
 #include "photobox_photo.h"
 
 #include <stdio.h>


@@ -12,7 +14,7 @@
 static Camera *camera;
 static GPContext *context;
 
 static Camera *camera;
 static GPContext *context;
 

-void dumperror(GPLogLevel level, const char *domain, const char *str, void *data)
+static void dumperror(GPLogLevel level, const char *domain, const char *str, void *data)

 {
         // suppress unused parameter errors (ugly):
         (void) level;
 {
         // suppress unused parameter errors (ugly):
         (void) level;


@@ -49,14 +51,10 @@ int pb_ph_init(void)
         gp_context_unref(context);
         return ret;
 }
         gp_context_unref(context);
         return ret;
 }

-int pb_ph_uninit(void)
+void pb_ph_uninit(void)

 {
 {

-        int ret;
-
-        ret = gp_camera_exit(camera, context);
+        gp_camera_exit(camera, context);

         gp_context_unref(context);
         gp_context_unref(context);

-
-        return ret;

 }
 
 // unused, unmaintained:
 }
 
 // unused, unmaintained:


@@ -123,7 +121,6 @@ int pb_ph_capture_file(const char *fn)
         if (ret != GP_OK)
                 goto error_fd;
 
         if (ret != GP_OK)
                 goto error_fd;
 

-        //

         ret = gp_camera_file_get(camera, camera_file_path.folder,
                 camera_file_path.name, GP_FILE_TYPE_NORMAL, file, context);
 
         ret = gp_camera_file_get(camera, camera_file_path.folder,
                 camera_file_path.name, GP_FILE_TYPE_NORMAL, file, context);