From d9de6fca6cda2a7ddeeb936692b529182a14dec9 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 19 Dec 2008 00:50:21 +0000 Subject: 2.5: Change blenloader module to use the Report system for reporting errors. --- source/blender/readblenfile/intern/BLO_readblenfile.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'source/blender/readblenfile/intern') diff --git a/source/blender/readblenfile/intern/BLO_readblenfile.c b/source/blender/readblenfile/intern/BLO_readblenfile.c index ec71611b31d..a988b269725 100644 --- a/source/blender/readblenfile/intern/BLO_readblenfile.c +++ b/source/blender/readblenfile/intern/BLO_readblenfile.c @@ -51,6 +51,7 @@ #include "BLO_readblenfile.h" #include "BKE_blender.h" +#include "BKE_report.h" #include "BLI_blenlib.h" @@ -130,7 +131,7 @@ cleanup: BlendFileData * blo_read_runtime( char *path, - BlendReadError *error_r) + ReportList *reports) { BlendFileData *bfd= NULL; int fd, actualsize, datastart; @@ -138,7 +139,7 @@ blo_read_runtime( fd= open(path, O_BINARY|O_RDONLY, 0); if (fd==-1) { - *error_r= BRE_UNABLE_TO_OPEN; + BKE_report(reports, RPT_ERROR, "Unable to open"); goto cleanup; } @@ -148,18 +149,18 @@ blo_read_runtime( datastart= handle_read_msb_int(fd); if (datastart==-1) { - *error_r= BRE_UNABLE_TO_READ; + BKE_report(reports, RPT_ERROR, "Unable to read"); goto cleanup; } else if (read(fd, buf, 8)!=8) { - *error_r= BRE_UNABLE_TO_READ; + BKE_report(reports, RPT_ERROR, "Unable to read"); goto cleanup; } else if (memcmp(buf, "BRUNTIME", 8)!=0) { - *error_r= BRE_NOT_A_BLEND; + BKE_report(reports, RPT_ERROR, "File is not a Blender file"); goto cleanup; } else { //printf("starting to read runtime from %s at datastart %d\n", path, datastart); lseek(fd, datastart, SEEK_SET); - bfd = blo_read_blendafterruntime(fd, path, actualsize-datastart, error_r); + bfd = blo_read_blendafterruntime(fd, path, actualsize-datastart, reports); fd= -1; // file was closed in blo_read_blendafterruntime() } -- cgit v1.2.3