X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/32f761755e2cfee243a1513c9ea9871586463fa6..58cadc8608fbb2cbc7b74578cd92de4337a4b887:/params.c diff --git a/params.c b/params.c index 323d20ba..56a2a914 100644 --- a/params.c +++ b/params.c @@ -207,7 +207,7 @@ static BOOL Section( FILE *InFile, BOOL (*sfunc)(char *) ) if( i > (bSize - 2) ) { bSize += BUFR_INC; - bufr = Realloc( bufr, bSize ); + bufr = realloc_array( bufr, char, bSize ); if( NULL == bufr ) { rprintf(FERROR, "%s Memory re-allocation failure.", func); @@ -301,7 +301,7 @@ static BOOL Parameter( FILE *InFile, BOOL (*pfunc)(char *, char *), int c ) if( i > (bSize - 2) ) /* Ensure there's space for next char. */ { bSize += BUFR_INC; - bufr = Realloc( bufr, bSize ); + bufr = realloc_array( bufr, char, bSize ); if( NULL == bufr ) { rprintf(FERROR, "%s Memory re-allocation failure.", func) ; @@ -366,7 +366,7 @@ static BOOL Parameter( FILE *InFile, BOOL (*pfunc)(char *, char *), int c ) if( i > (bSize - 2) ) /* Make sure there's enough room. */ { bSize += BUFR_INC; - bufr = Realloc( bufr, bSize ); + bufr = realloc_array( bufr, char, bSize ); if( NULL == bufr ) { rprintf(FERROR, "%s Memory re-allocation failure.", func) ; @@ -491,8 +491,8 @@ static FILE *OpenConfFile( char *FileName ) OpenedFile = fopen( FileName, "r" ); if( NULL == OpenedFile ) { - rprintf(FERROR,"%s Unable to open configuration file \"%s\":\n\t%s\n", - func, FileName, strerror(errno)); + rprintf(FERROR,"rsync: unable to open configuration file \"%s\": %s\n", + FileName, strerror(errno)); } return( OpenedFile ); @@ -530,7 +530,7 @@ BOOL pm_process( char *FileName, else /* If we don't have a buffer */ { /* allocate one, then parse, */ bSize = BUFR_INC; /* then free. */ - bufr = (char *)malloc( bSize ); + bufr = new_array( char, bSize ); if( NULL == bufr ) { rprintf(FERROR,"%s memory allocation failure.\n", func);