From 86e2e9b8a3d1c598634308d91cf1fb2c52efd9bd Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Mon, 24 Jun 2002 20:26:37 +0000
Subject: backing out changes for now (This used to be commit
 e3422addeb2a74ba92e3b5374d1a1efbcc825d5a)

---
 source3/printing/pcap.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'source3/printing')

diff --git a/source3/printing/pcap.c b/source3/printing/pcap.c
index 01e03c7c6b..920c6f354e 100644
--- a/source3/printing/pcap.c
+++ b/source3/printing/pcap.c
@@ -111,7 +111,7 @@ static void ScanQconfig_fn(char *psz,void (*fn)(char *, char *))
 
 	iEtat = 0;
 	/* scan qconfig file for searching <printername>:	*/
-	for (;(line = fgets_slash(NULL,sizeof(pstring),pfile)); SAFE_FREE(line))
+	for (;(line = fgets_slash(NULL,sizeof(pstring),pfile)); free(line))
 	{
 		if (*line == '*' || *line == 0)
 		continue;
@@ -181,7 +181,7 @@ static BOOL ScanQconfig(char *psz,char *pszPrintername)
 	if ((pfile = x_fopen(psz, O_RDONLY, 0)) == NULL)
 	{
 	      DEBUG(0,( "Unable to open qconfig file %s for read!\n", psz));
-	      SAFE_FREE(pName);
+	      free(pName);
 	      return(False);
 	}
 	slprintf(pName, iLg + 9, "%s:",pszPrintername);
@@ -189,7 +189,7 @@ static BOOL ScanQconfig(char *psz,char *pszPrintername)
 	/*DEBUG(3,( " Looking for entry %s\n",pName));*/
 	iEtat = 0;
 	/* scan qconfig file for searching <printername>:	*/
-	for (;(line = fgets_slash(NULL,sizeof(pstring),pfile)); SAFE_FREE(line))
+	for (;(line = fgets_slash(NULL,sizeof(pstring),pfile)); free(line))
 	{
 		if (*line == '*' || *line == 0)
 		continue;
@@ -208,8 +208,8 @@ static BOOL ScanQconfig(char *psz,char *pszPrintername)
 		  	 {
 		  	   /* name is found without stanza device  */
 		  	   /* probably a good printer ???		*/
-		  	   SAFE_FREE (line);
-		  	   SAFE_FREE(pName);
+		  	   free (line);
+		  	   free(pName);
 		  	   fclose(pfile);
 		  	   return(True);
 		  	  }
@@ -222,15 +222,15 @@ static BOOL ScanQconfig(char *psz,char *pszPrintername)
 		  	  else if (strlocate(line,"device"))
 		  	  {
 		  		/* it's a good virtual printer */
-		  		SAFE_FREE (line);
-		  		SAFE_FREE(pName);
+		  		free (line);
+		  		free(pName);
 		  		fclose(pfile);
 		  		return(True);
 		  	  }
 		  	  break;
 		}
 	}
-	SAFE_FREE (pName);
+	free (pName);
 	x_fclose(pfile);
 	return(False);
 }
@@ -288,7 +288,7 @@ BOOL pcap_printername_ok(char *pszPrintername, char *pszPrintcapname)
       return(False);
     }
 
-  for (;(line = fgets_slash(NULL,sizeof(pstring),pfile)); SAFE_FREE(line))
+  for (;(line = fgets_slash(NULL,sizeof(pstring),pfile)); free(line))
     {
       if (*line == '#' || *line == 0)
 	continue;
@@ -307,7 +307,7 @@ BOOL pcap_printername_ok(char *pszPrintername, char *pszPrintcapname)
 	    {
 	      /* normalise the case */
 	      pstrcpy(pszPrintername,p);
-	      SAFE_FREE(line);
+	      free(line);
 	      x_fclose(pfile);
 	      return(True);	      
 	    }
@@ -369,7 +369,7 @@ void pcap_printer_fn(void (*fn)(char *, char *))
       return;
     }
 
-  for (;(line = fgets_slash(NULL,sizeof(pstring),pfile)); SAFE_FREE(line))
+  for (;(line = fgets_slash(NULL,sizeof(pstring),pfile)); free(line))
     {
       if (*line == '#' || *line == 0)
 	continue;
-- 
cgit