mirror of
https://github.com/DarkPlacesEngine/gmqcc.git
synced 2025-02-25 20:51:38 +00:00
A prototype for error handling
This commit is contained in:
parent
e761f1f7b7
commit
8ce0548ad5
1 changed files with 22 additions and 6 deletions
28
exec.c
28
exec.c
|
@ -1,7 +1,21 @@
|
||||||
|
#include <errno.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <stdarg.h>
|
||||||
|
|
||||||
#include "gmqcc.h"
|
#include "gmqcc.h"
|
||||||
|
|
||||||
#include "exec.h"
|
#include "exec.h"
|
||||||
|
|
||||||
|
static void loaderror(const char *fmt, ...)
|
||||||
|
{
|
||||||
|
int err = errno;
|
||||||
|
va_list ap;
|
||||||
|
va_start(ap, fmt);
|
||||||
|
vprintf(fmt, ap);
|
||||||
|
va_end(ap);
|
||||||
|
printf(": %s\n", strerror(err));
|
||||||
|
}
|
||||||
|
|
||||||
qc_program* prog_load(const char *filename)
|
qc_program* prog_load(const char *filename)
|
||||||
{
|
{
|
||||||
qc_program *prog;
|
qc_program *prog;
|
||||||
|
@ -13,14 +27,13 @@ qc_program* prog_load(const char *filename)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
if (fread(&header, sizeof(header), 1, file) != 1) {
|
if (fread(&header, sizeof(header), 1, file) != 1) {
|
||||||
perror("read");
|
loaderror("failed to read header from '%s'", filename);
|
||||||
fclose(file);
|
fclose(file);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (header.version != 6) {
|
if (header.version != 6) {
|
||||||
printf("header says this is a version %i progs, we need version 6\n",
|
loaderror("header says this is a version %i progs, we need version 6\n", header.version);
|
||||||
header.version);
|
|
||||||
fclose(file);
|
fclose(file);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
@ -36,11 +49,14 @@ qc_program* prog_load(const char *filename)
|
||||||
prog->entityfields = header.entfield;
|
prog->entityfields = header.entfield;
|
||||||
|
|
||||||
prog->filename = util_strdup(filename);
|
prog->filename = util_strdup(filename);
|
||||||
if (!prog->filename)
|
if (!prog->filename) {
|
||||||
|
loaderror("failed to store program name");
|
||||||
goto error;
|
goto error;
|
||||||
|
}
|
||||||
|
|
||||||
#define read_data(hdrvar, progvar, type) \
|
#define read_data(hdrvar, progvar, type) \
|
||||||
if (fseek(file, header.hdrvar.offset, SEEK_SET) != 0) { \
|
if (fseek(file, header.hdrvar.offset, SEEK_SET) != 0) { \
|
||||||
perror("fseek"); \
|
loaderror("seek failed"); \
|
||||||
goto error; \
|
goto error; \
|
||||||
} \
|
} \
|
||||||
prog->progvar##_alloc = header.hdrvar.length; \
|
prog->progvar##_alloc = header.hdrvar.length; \
|
||||||
|
@ -50,7 +66,7 @@ qc_program* prog_load(const char *filename)
|
||||||
goto error; \
|
goto error; \
|
||||||
if (fread(prog->progvar, sizeof(*prog->progvar), header.hdrvar.length, file) \
|
if (fread(prog->progvar, sizeof(*prog->progvar), header.hdrvar.length, file) \
|
||||||
!= header.hdrvar.length) { \
|
!= header.hdrvar.length) { \
|
||||||
perror("read"); \
|
loaderror("read failed"); \
|
||||||
goto error; \
|
goto error; \
|
||||||
}
|
}
|
||||||
#define read_data1(x, y) read_data(x, x, y)
|
#define read_data1(x, y) read_data(x, x, y)
|
||||||
|
|
Loading…
Reference in a new issue