1.1 --- a/librazor/util.c	Sat Aug 23 16:28:31 2014 +0100
     1.2 +++ b/librazor/util.c	Thu Sep 11 18:54:16 2014 +0100
     1.3 @@ -74,12 +74,12 @@
     1.4  
     1.5  	fd = open(filename, O_RDONLY | O_BINARY);
     1.6  	if (fd < 0) {
     1.7 -		razor_set_error(error, filename, strerror(errno));
     1.8 +		razor_set_error_posix(error, filename);
     1.9  		return NULL;
    1.10  	}
    1.11  
    1.12  	if (fstat(fd, &st) < 0) {
    1.13 -		razor_set_error(error, filename, strerror(errno));
    1.14 +		razor_set_error_posix(error, filename);
    1.15  		close(fd);
    1.16  		return NULL;
    1.17  	}
    1.18 @@ -99,8 +99,7 @@
    1.19  			while(nb < st.st_size) {
    1.20  				res = read(fd, addr + nb, st.st_size - nb);
    1.21  				if (res <= 0) {
    1.22 -					razor_set_error(error, filename,
    1.23 -							strerror(errno));
    1.24 +					razor_set_error_posix(error, filename);
    1.25  					free(addr);
    1.26  					addr = NULL;
    1.27  					break;
    1.28 @@ -108,7 +107,8 @@
    1.29  				nb += res;
    1.30  			}
    1.31  		} else
    1.32 -			razor_set_error(error, NULL, "Not enough memory");
    1.33 +			razor_set_error(error, RAZOR_POSIX_ERROR, ENOMEM, NULL,
    1.34 +					"Not enough memory");
    1.35  	}
    1.36  	close(fd);
    1.37