diff --git a/src/my.c b/src/my.c
index 28dba3d4a81fd4ca902245dd086261a8c7b74512..a7adf3c5c0087bb1294034f5e8d3ddda274846f4 100644 (file)
--- a/src/my.c
+++ b/src/my.c
-/*
- Copyright (C) Prikol Software 1996-1997
- Copyright (C) Aleksey Volynskov 1996-1997
- Copyright (C) <ARembo@gmail.com> 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 <http://www.gnu.org/licenses/>.
+ */
- 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 <http://www.gnu.org/licenses/> 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 <stdio.h>
#include <stdint.h>
#include <assert.h>
}
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) {