[Squeak-Commits] squeak/platforms/Mac OS/plugins/FilePlugin sqMacDirectory.c,1.10,1.11

[John M M. <jo...@us...>]

Update of /cvsroot/squeak/squeak/platforms/Mac OS/plugins/FilePlugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27064/squeak/platforms/Mac OS/plugins/FilePlugin

Modified Files:
	sqMacDirectory.c 
Log Message:
3.7.4b3 Compiler warning reduction process. Return 0 if required, flag or removed unused variables, fix ambigous warning messages

Index: sqMacDirectory.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/plugins/FilePlugin/sqMacDirectory.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** sqMacDirectory.c	23 Apr 2004 20:45:30 -0000	1.10
--- sqMacDirectory.c	3 Aug 2004 02:39:35 -0000	1.11
***************
*** 87,91 ****
  
      char cFileName[1001];
-     int err;
  
      if (pathStringLength >= 1000) {
--- 87,90 ----
***************
*** 103,106 ****
--- 102,106 ----
          UniChar         buffer[1024];
          long            tokenLength;
+ 		int err;
          
          filePath   = CFStringCreateWithBytes(kCFAllocatorDefault,(UInt8 *)cFileName,strlen(cFileName),gCurrentVMEncoding,false);
***************
*** 137,141 ****
  	/* Delete the existing directory with the given path. */
      char cFileName[1000];
-     int err;
  
      if (pathStringLength >= 1000) {
--- 137,140 ----
***************
*** 215,219 ****
  		HFSUniStr255 uniStr;
  		FSVolumeInfo volumeInfo;
- 		FSRef fsRef;
      
  	/* default return values */
--- 214,217 ----
***************
*** 286,290 ****
  			if (gCurrentVMEncoding == kCFStringEncodingUTF8) 
  				CFStringNormalize(mStr, kCFStringNormalizationFormKC); // pre-combined
- 			CFIndex len =  CFStringGetLength(mStr);
  			CFStringGetCString(mStr, name, 256, gCurrentVMEncoding);
  			CFRelease(mStr);
--- 284,287 ----
***************
*** 381,385 ****
  }
  
! dir_SetMacFileTypeAndCreator(char *filename, int filenameSize, char *fType, char *fCreator) {
  	/* Set the Macintosh type and creator of the given file. */
  	/* Note: On other platforms, this is just a noop. */
--- 378,382 ----
  }
  
! int dir_SetMacFileTypeAndCreator(char *filename, int filenameSize, char *fType, char *fCreator) {
  	/* Set the Macintosh type and creator of the given file. */
  	/* Note: On other platforms, this is just a noop. */
***************
*** 397,401 ****
  }
  
! dir_GetMacFileTypeAndCreator(char *filename, int filenameSize, char *fType, char *fCreator) {
  	/* Get the Macintosh type and creator of the given file. */
  	/* Note: On other platforms, this is just a noop. */
--- 394,398 ----
  }
  
! int dir_GetMacFileTypeAndCreator(char *filename, int filenameSize, char *fType, char *fCreator) {
  	/* Get the Macintosh type and creator of the given file. */
  	/* Note: On other platforms, this is just a noop. */
***************
*** 442,446 ****
  		lastPathValid = false;
  		lastSpec = *spec;
! 		return;
  	}
  	strncpy(lastPath,pathString,pathStringLength);
--- 439,443 ----
  		lastPathValid = false;
  		lastSpec = *spec;
! 		return 0;
  	}
  	strncpy(lastPath,pathString,pathStringLength);
***************
*** 448,451 ****
--- 445,449 ----
  	lastPathValid = true;
  	lastSpec = *spec;
+ 	return 0;
  }