resolved merge conflict

tsk/auto/auto_db.cpp

@@ -200,7 +200,7 @@ uint8_t
 
     return 0;
 #else
-    return openImageUtf8(a_num, a_images, a_type, a_ssize, dataSourceId);
+    return openImageUtf8(a_num, a_images, a_type, a_ssize, a_deviceId);
 #endif
 }
 

tsk/img/ewf.c

@@ -34,9 +34,7 @@ getError(libewf_error_t * ewf_error,
     error_string[0] = '\0';
     retval = libewf_error_backtrace_sprint(ewf_error,
         error_string, TSK_EWF_ERROR_STRING_SIZE);
-    if (retval)
-        return 1;
-    return 0;
+    return retval <= 0;
 }
 #endif