[arrayfire] 196/284: Cleaning up error messages in loading and saving files

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/experimental
in repository arrayfire.

commit 43d030dfd3e69082555af743b0b8b395c6ce00d1
Author: Pavan Yalamanchili <pavan at arrayfire.com>
Date:   Mon Jan 11 13:59:31 2016 -0500

    Cleaning up error messages in loading and saving files
---
 src/api/c/stream.cpp | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/api/c/stream.cpp b/src/api/c/stream.cpp
index a7b5771..17cc945 100644
--- a/src/api/c/stream.cpp
+++ b/src/api/c/stream.cpp
@@ -249,12 +249,17 @@ static af_array checkVersionAndRead(const char *filename, const unsigned index)
 {
     char version = 0;
 
-    std::fstream fs(filename, std::fstream::in | std::fstream::binary);
+    std::string filenameStr = std::string(filename);
+    std::fstream fs(filenameStr, std::fstream::in | std::fstream::binary);
     // Throw exception if file is not open
-    if(!fs.is_open()) AF_ERROR("File failed to open", AF_ERR_ARG);
+    if(!fs.is_open()) {
+        std::string errStr = "Failed to open: " + filenameStr;
+        AF_ERROR(errStr.c_str(), AF_ERR_ARG);
+    }
 
     if(fs.peek() == std::fstream::traits_type::eof()) {
-        AF_ERROR("File is empty", AF_ERR_ARG);
+        std::string errStr = filenameStr + " is empty";
+        AF_ERROR(errStr.c_str(), AF_ERR_ARG);
     } else {
         fs.read(&version, sizeof(char));
     }
@@ -270,13 +275,18 @@ int checkVersionAndFindIndex(const char *filename, const char *k)
 {
     char version = 0;
     std::string key(k);
+    std::string filenameStr(filename);
+    std::ifstream fs(filenameStr, std::ifstream::in | std::ifstream::binary);
 
-    std::ifstream fs(filename, std::ifstream::in | std::ifstream::binary);
     // Throw exception if file is not open
-    if(!fs.is_open()) AF_ERROR("File failed to open", AF_ERR_ARG);
+    if(!fs.is_open()) {
+        std::string errStr = "Failed to open: " + filenameStr;
+        AF_ERROR(errStr.c_str(), AF_ERR_ARG);
+    }
 
     if(fs.peek() == std::ifstream::traits_type::eof()) {
-        AF_ERROR("File is empty", AF_ERR_ARG);
+        std::string errStr = filenameStr + " is empty";
+        AF_ERROR(errStr.c_str(), AF_ERR_ARG);
     } else {
         fs.read(&version, sizeof(char));
     }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/arrayfire.git