X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fcommon%2Freadwrite.c;h=c2c970d292cb9579d5e6fddc64eb733ac3524246;hb=d361b21fb63d9e1fd2ff7774c2322fab3e4eb239;hp=026c9add7aba8e5434f158bb97c765d957d88d55;hpb=dd9d65ee727ac7e95801da0f8b5bae7009811802;p=plomrogue
diff --git a/src/common/readwrite.c b/src/common/readwrite.c
index 026c9ad..c2c970d 100644
--- a/src/common/readwrite.c
+++ b/src/common/readwrite.c
@@ -2,7 +2,7 @@
#include "readwrite.h"
#include /* size_t */
-#include /* uint8_t, uint16_t, uint32_t */
+#include /* uint8_t, uint16_t, uint32_t, UINT32_MAX */
#include /* FILE, fseek(), sprintf(), fgets(), fgetc(), ferror(),
* fputc(), fwrite(), fclose(), fopen()
*/
@@ -95,12 +95,11 @@ extern void try_fclose_unlink_rename(FILE * file, char * p1, char * p2,
-extern uint32_t textfile_sizes(FILE * file, uint32_t * n_lines_p)
+extern uint32_t textfile_width(FILE * file)
{
- char * f_name = "textfile_sizes()";
+ char * f_name = "textfile_width()";
int c = 0;
uint32_t c_count = 0;
- uint32_t n_lines = 0;
uint32_t linemax = 0;
while (1)
{
@@ -110,6 +109,7 @@ extern uint32_t textfile_sizes(FILE * file, uint32_t * n_lines_p)
break;
}
c_count++;
+ exit_trouble(UINT32_MAX == c_count, f_name, "too large text file line");
if ('\n' == c)
{
if (c_count > linemax)
@@ -117,10 +117,6 @@ extern uint32_t textfile_sizes(FILE * file, uint32_t * n_lines_p)
linemax = c_count;
}
c_count = 0;
- if (n_lines_p)
- {
- n_lines++;
- }
}
}
if (0 == linemax && 0 < c_count) /* Handle files that consist of only one */
@@ -128,9 +124,5 @@ extern uint32_t textfile_sizes(FILE * file, uint32_t * n_lines_p)
linemax = c_count;
}
exit_trouble(-1 == fseek(file, 0, SEEK_SET), f_name, "fseek()");
- if (n_lines_p)
- {
- * n_lines_p = n_lines;
- }
return linemax;
}