From aa5996d58e68edfbefe51061856aecd549dd09c4 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Tue, 13 Jan 2015 01:27:08 +0000
Subject: [PATCH] Faster
---
src/utils.c | 42 ++++++++++++++++++++++++------------------
1 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/src/utils.c b/src/utils.c
index 365faeb..28be2ec 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -3,6 +3,7 @@
#include <string.h>
#include <math.h>
#include <float.h>
+#include <limits.h>
#include "utils.h"
@@ -64,8 +65,8 @@
list *split_str(char *s, char delim)
{
- int i;
- int len = strlen(s);
+ size_t i;
+ size_t len = strlen(s);
list *l = make_list();
list_insert(l, s);
for(i = 0; i < len; ++i){
@@ -79,9 +80,9 @@
void strip(char *s)
{
- int i;
- int len = strlen(s);
- int offset = 0;
+ size_t i;
+ size_t len = strlen(s);
+ size_t offset = 0;
for(i = 0; i < len; ++i){
char c = s[i];
if(c==' '||c=='\t'||c=='\n') ++offset;
@@ -92,9 +93,9 @@
void strip_char(char *s, char bad)
{
- int i;
- int len = strlen(s);
- int offset = 0;
+ size_t i;
+ size_t len = strlen(s);
+ size_t offset = 0;
for(i = 0; i < len; ++i){
char c = s[i];
if(c==bad) ++offset;
@@ -106,26 +107,30 @@
char *fgetl(FILE *fp)
{
if(feof(fp)) return 0;
- unsigned long size = 512;
+ size_t size = 512;
char *line = malloc(size*sizeof(char));
if(!fgets(line, size, fp)){
free(line);
return 0;
}
- int curr = strlen(line);
+ size_t curr = strlen(line);
- while(line[curr-1]!='\n'){
- size *= 2;
- line = realloc(line, size*sizeof(char));
- if(!line) {
- printf("%ld\n", size);
- malloc_error();
+ while((line[curr-1] != '\n') && !feof(fp)){
+ if(curr == size-1){
+ size *= 2;
+ line = realloc(line, size*sizeof(char));
+ if(!line) {
+ printf("%ld\n", size);
+ malloc_error();
+ }
}
- fgets(&line[curr], size-curr, fp);
+ size_t readsize = size-curr;
+ if(readsize > INT_MAX) readsize = INT_MAX-1;
+ fgets(&line[curr], readsize, fp);
curr = strlen(line);
}
- line[curr-1] = '\0';
+ if(line[curr-1] == '\n') line[curr-1] = '\0';
return line;
}
@@ -243,6 +248,7 @@
a[i] *= s;
}
}
+
int max_index(float *a, int n)
{
if(n <= 0) return -1;
--
Gitblit v1.10.0