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);
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) ;
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) ;
OpenedFile = fopen( FileName, "r" );
if( NULL == OpenedFile )
{
- rprintf(FERROR,"rsync: unable to open configuration file \"%s\": %s\n",
- FileName, strerror(errno));
+ rsyserr(FERROR, errno, "rsync: unable to open configuration file \"%s\"",
+ safe_fname(FileName));
}
return( OpenedFile );
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);