niceify code to avoid valgrind errors
This commit is contained in:
parent
0ead5c7efa
commit
3c6c0c46a1
@ -159,21 +159,24 @@ int read_config(char *name, int search, cfgopts_t cfgopts[], char *filter) {
|
|||||||
static int parse_config (FILE *configfile, cfgopts_t configoptions[],
|
static int parse_config (FILE *configfile, cfgopts_t configoptions[],
|
||||||
char *filter) {
|
char *filter) {
|
||||||
char buff[1024];
|
char buff[1024];
|
||||||
char *ptr;
|
char *ptr=NULL;
|
||||||
int i, k;
|
int i, k;
|
||||||
int num;
|
int num;
|
||||||
size_t len;
|
size_t len;
|
||||||
char *tmpptr;
|
char *tmpptr=NULL;
|
||||||
char *eqsign;
|
char *eqsign=NULL;
|
||||||
|
|
||||||
while (fgets(buff,sizeof(buff),configfile) != NULL) {
|
while (fgets(buff,sizeof(buff),configfile) != NULL) {
|
||||||
/* life insurance */
|
/* life insurance */
|
||||||
buff[sizeof(buff)-1]='\0';
|
buff[sizeof(buff)-1]='\0';
|
||||||
|
|
||||||
/* strip New line & CR if present */
|
/* strip New line & CR if present */
|
||||||
|
len=strlen(buff);
|
||||||
for (i=1; i<=2; i++) {
|
for (i=1; i<=2; i++) {
|
||||||
if ((buff[strlen(buff)-i]=='\n') || (buff[strlen(buff)-i]=='\r')) {
|
k=len-i;
|
||||||
buff[strlen(buff)-i]='\0';
|
if (k<0) { k=0; }
|
||||||
|
if ((buff[k]=='\n') || (buff[k]=='\r')) {
|
||||||
|
buff[k]='\0';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user