From 07a7800ebd59c780e544928be72164aa04ffd826 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Mon, 25 Feb 2008 14:13:12 +0000 Subject: Moved tools to all-C++ code (ensures consistency of all code during compilation, and allows us to use advanced stuff, like code from common/, in the tools) svn-id: r30963 --- tools/create_kyradat/util.c | 137 ------------------------------------------ tools/create_kyradat/util.cpp | 137 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 137 insertions(+), 137 deletions(-) delete mode 100644 tools/create_kyradat/util.c create mode 100644 tools/create_kyradat/util.cpp (limited to 'tools/create_kyradat') diff --git a/tools/create_kyradat/util.c b/tools/create_kyradat/util.c deleted file mode 100644 index 821a3abda4..0000000000 --- a/tools/create_kyradat/util.c +++ /dev/null @@ -1,137 +0,0 @@ -/* Scumm Tools - * Copyright (C) 2003-2006 The ScummVM Team - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * $URL$ - * $Id$ - * - */ - -#include "util.h" -#include - -#ifdef _MSC_VER - #define vsnprintf _vsnprintf -#endif - -void error(const char *s, ...) { - char buf[1024]; - va_list va; - - va_start(va, s); - vsnprintf(buf, 1024, s, va); - va_end(va); - - fprintf(stderr, "ERROR: %s!\n", buf); - - exit(1); -} - -void warning(const char *s, ...) { - char buf[1024]; - va_list va; - - va_start(va, s); - vsnprintf(buf, 1024, s, va); - va_end(va); - - fprintf(stderr, "WARNING: %s!\n", buf); -} - -void debug(int level, const char *s, ...) { - char buf[1024]; - va_list va; - - va_start(va, s); - vsnprintf(buf, 1024, s, va); - va_end(va); - - fprintf(stderr, "DEBUG: %s!\n", buf); -} - -uint8 readByte(FILE *fp) { - return fgetc(fp); -} - -uint16 readUint16BE(FILE *fp) { - uint16 ret = 0; - ret |= fgetc(fp) << 8; - ret |= fgetc(fp); - return ret; -} - -uint16 readUint16LE(FILE *fp) { - uint16 ret = 0; - ret |= fgetc(fp); - ret |= fgetc(fp) << 8; - return ret; -} - -uint32 readUint32BE(FILE *fp) { - uint32 ret = 0; - ret |= fgetc(fp) << 24; - ret |= fgetc(fp) << 16; - ret |= fgetc(fp) << 8; - ret |= fgetc(fp); - return ret; -} - -uint32 readUint32LE(FILE *fp) { - uint32 ret = 0; - ret |= fgetc(fp); - ret |= fgetc(fp) << 8; - ret |= fgetc(fp) << 16; - ret |= fgetc(fp) << 24; - return ret; -} - -void writeByte(FILE *fp, uint8 b) { - fwrite(&b, 1, 1, fp); -} - -void writeUint16BE(FILE *fp, uint16 value) { - writeByte(fp, (uint8)(value >> 8)); - writeByte(fp, (uint8)(value)); -} - -void writeUint16LE(FILE *fp, uint16 value) { - writeByte(fp, (uint8)(value)); - writeByte(fp, (uint8)(value >> 8)); -} - -void writeUint32BE(FILE *fp, uint32 value) { - writeByte(fp, (uint8)(value >> 24)); - writeByte(fp, (uint8)(value >> 16)); - writeByte(fp, (uint8)(value >> 8)); - writeByte(fp, (uint8)(value)); -} - -void writeUint32LE(FILE *fp, uint32 value) { - writeByte(fp, (uint8)(value)); - writeByte(fp, (uint8)(value >> 8)); - writeByte(fp, (uint8)(value >> 16)); - writeByte(fp, (uint8)(value >> 24)); -} - -uint32 fileSize(FILE *fp) { - uint32 sz; - uint32 pos = ftell(fp); - fseek(fp, 0, SEEK_END); - sz = ftell(fp); - fseek(fp, pos, SEEK_SET); - return sz; -} - diff --git a/tools/create_kyradat/util.cpp b/tools/create_kyradat/util.cpp new file mode 100644 index 0000000000..821a3abda4 --- /dev/null +++ b/tools/create_kyradat/util.cpp @@ -0,0 +1,137 @@ +/* Scumm Tools + * Copyright (C) 2003-2006 The ScummVM Team + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * $URL$ + * $Id$ + * + */ + +#include "util.h" +#include + +#ifdef _MSC_VER + #define vsnprintf _vsnprintf +#endif + +void error(const char *s, ...) { + char buf[1024]; + va_list va; + + va_start(va, s); + vsnprintf(buf, 1024, s, va); + va_end(va); + + fprintf(stderr, "ERROR: %s!\n", buf); + + exit(1); +} + +void warning(const char *s, ...) { + char buf[1024]; + va_list va; + + va_start(va, s); + vsnprintf(buf, 1024, s, va); + va_end(va); + + fprintf(stderr, "WARNING: %s!\n", buf); +} + +void debug(int level, const char *s, ...) { + char buf[1024]; + va_list va; + + va_start(va, s); + vsnprintf(buf, 1024, s, va); + va_end(va); + + fprintf(stderr, "DEBUG: %s!\n", buf); +} + +uint8 readByte(FILE *fp) { + return fgetc(fp); +} + +uint16 readUint16BE(FILE *fp) { + uint16 ret = 0; + ret |= fgetc(fp) << 8; + ret |= fgetc(fp); + return ret; +} + +uint16 readUint16LE(FILE *fp) { + uint16 ret = 0; + ret |= fgetc(fp); + ret |= fgetc(fp) << 8; + return ret; +} + +uint32 readUint32BE(FILE *fp) { + uint32 ret = 0; + ret |= fgetc(fp) << 24; + ret |= fgetc(fp) << 16; + ret |= fgetc(fp) << 8; + ret |= fgetc(fp); + return ret; +} + +uint32 readUint32LE(FILE *fp) { + uint32 ret = 0; + ret |= fgetc(fp); + ret |= fgetc(fp) << 8; + ret |= fgetc(fp) << 16; + ret |= fgetc(fp) << 24; + return ret; +} + +void writeByte(FILE *fp, uint8 b) { + fwrite(&b, 1, 1, fp); +} + +void writeUint16BE(FILE *fp, uint16 value) { + writeByte(fp, (uint8)(value >> 8)); + writeByte(fp, (uint8)(value)); +} + +void writeUint16LE(FILE *fp, uint16 value) { + writeByte(fp, (uint8)(value)); + writeByte(fp, (uint8)(value >> 8)); +} + +void writeUint32BE(FILE *fp, uint32 value) { + writeByte(fp, (uint8)(value >> 24)); + writeByte(fp, (uint8)(value >> 16)); + writeByte(fp, (uint8)(value >> 8)); + writeByte(fp, (uint8)(value)); +} + +void writeUint32LE(FILE *fp, uint32 value) { + writeByte(fp, (uint8)(value)); + writeByte(fp, (uint8)(value >> 8)); + writeByte(fp, (uint8)(value >> 16)); + writeByte(fp, (uint8)(value >> 24)); +} + +uint32 fileSize(FILE *fp) { + uint32 sz; + uint32 pos = ftell(fp); + fseek(fp, 0, SEEK_END); + sz = ftell(fp); + fseek(fp, pos, SEEK_SET); + return sz; +} + -- cgit v1.2.3