X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fmy.c;h=a7adf3c5c0087bb1294034f5e8d3ddda274846f4;hb=2cd3d04c04fb347e6eea354dccf14099f56bd352;hp=28dba3d4a81fd4ca902245dd086261a8c7b74512;hpb=de05b18ef2a99168b0a1a8a921a4b18ec7023833;p=flatwaifu.git diff --git a/src/my.c b/src/my.c index 28dba3d..a7adf3c 100644 --- a/src/my.c +++ b/src/my.c @@ -1,28 +1,25 @@ -/* - Copyright (C) Prikol Software 1996-1997 - Copyright (C) Aleksey Volynskov 1996-1997 - Copyright (C) 2011 +/* Copyright (C) 1996-1997 Aleksey Volynskov + * Copyright (C) 2011 Rambo + * Copyright (C) 2020 SovietPony + * + * 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, version 3 of the License ONLY. + * + * 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, see . + */ - This file is part of the Doom2D:Rembo project. - - Doom2D:Rembo is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - Doom2D:Rembo 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, see or - write to the Free Software Foundation, Inc., - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -*/ #include "glob.h" #include "error.h" -#include "misc.h" +#include "common/endianness.h" + #include #include #include @@ -84,9 +81,13 @@ size_t myfreadc (void *ptr, size_t size, size_t n, FILE *f) { } void myfread (void *ptr, size_t size, size_t n, FILE *f) { +#if 1 + myfreadc(ptr, size, n, f); +#else if (myfreadc(ptr, size, n, f) != n) { - ERR_fatal("File reading error\n"); + ERR_fatal("File reading error (readed %u, required %u)\n", m, n); } +#endif } int8_t myfread8 (FILE *f) {