]> git.datanom.net - lensdb.git/blobdiff - lib/scanner.cpp
Handle length of NULL strings
[lensdb.git] / lib / scanner.cpp
index 961f64ded8ef0d2021a8ee05949518017a7c75cf..a8a04342f62be71d49475918deca147bf2862dd9 100644 (file)
@@ -33,7 +33,7 @@ Scanner_t* scanner_create(const char* file) {
        Scanner_t* s;
        ExifScanner* obj;
        
-       s = (typeof(s))malloc(sizeof(*s));
+       s = g_new0(Scanner_t, 1);
        obj = new ExifScanner(file);
        s->obj = obj;
        
@@ -48,12 +48,32 @@ void scanner_destroy(Scanner_t* s) {
        free(s);
 }
 
-void scanner_do_work(Scanner_t* s) {
+gchar* get_lens_maker(Scanner_t* s) {
        ExifScanner* obj;
 
        if (s == NULL)
-               return;
+               return NULL;
+
+       obj = static_cast<ExifScanner *>(s->obj);
+       return obj->get_cstring(obj->get_maker());
+}
+
+gchar* get_lens_serial_number(Scanner_t* s) {
+       ExifScanner* obj;
+
+       if (s == NULL)
+               return NULL;
+
+       obj = static_cast<ExifScanner *>(s->obj);
+       return obj->get_cstring(obj->get_serial_number());
+}
+
+gchar* get_lens_info(Scanner_t* s) {
+       ExifScanner* obj;
+
+       if (s == NULL)
+               return NULL;
 
        obj = static_cast<ExifScanner *>(s->obj);
-       obj->scanner_do_work();
+       return obj->get_cstring(obj->get_lens());
 }
This page took 0.361659 seconds and 5 git commands to generate.