[Emacs-diffs] /srv/bzr/emacs/trunk r108977: * src/nsterm.m, src/nsterm.h (ns_etc_directory): Fix type, empty return.

[Glenn Morris]

------------------------------------------------------------
revno: 108977
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2012-07-09 17:14:12 -0400
message:
  * src/nsterm.m, src/nsterm.h (ns_etc_directory): Fix type, empty return.
modified:
  src/ChangeLog
  src/nsterm.h
  src/nsterm.m

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-09 21:12:08 +0000
+++ b/src/ChangeLog     2012-07-09 21:14:12 +0000
@@ -1,3 +1,7 @@
+2012-07-09  Glenn Morris  <address@hidden>
+
+       * nsterm.m, nsterm.h (ns_etc_directory): Fix type, empty return.
+
 2012-07-09  Paul Eggert  <address@hidden>
 
        * process.c (wait_reading_process_output): 'waitchannels' was unset

=== modified file 'src/nsterm.h'
--- a/src/nsterm.h      2012-07-09 07:07:24 +0000
+++ b/src/nsterm.h      2012-07-09 21:14:12 +0000
@@ -798,7 +798,7 @@
 #define NSAPP_DATA2_RUNASSCRIPT 10
 extern void ns_run_ascript (void);
 
-extern char *ns_etc_directory (void);
+extern const char *ns_etc_directory (void);
 extern void ns_init_paths (void);
 extern void syms_of_nsterm (void);
 extern void syms_of_nsfns (void);

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2012-07-09 07:07:24 +0000
+++ b/src/nsterm.m      2012-07-09 21:14:12 +0000
@@ -286,24 +286,24 @@
 }
 
 
-char *
+const char *
 ns_etc_directory (void)
 {
 /* If running as a self-contained app bundle, return as a string the
    filename of the etc directory, if present; else nil.  */
 
-     NSBundle *bundle = [NSBundle mainBundle];
-     NSString *resourceDir = [bundle resourcePath];
-     NSString *resourcePath;
-     NSFileManager *fileManager = [NSFileManager defaultManager];
-     BOOL isDir;
+  NSBundle *bundle = [NSBundle mainBundle];
+  NSString *resourceDir = [bundle resourcePath];
+  NSString *resourcePath;
+  NSFileManager *fileManager = [NSFileManager defaultManager];
+  BOOL isDir;
 
-     resourcePath = [resourceDir stringByAppendingPathComponent: @"etc"];
-     if ([fileManager fileExistsAtPath: resourcePath isDirectory: &isDir])
-     {
-          if (isDir) return [resourcePath UTF8String];
-     }
-     return nil;
+  resourcePath = [resourceDir stringByAppendingPathComponent: @"etc"];
+  if ([fileManager fileExistsAtPath: resourcePath isDirectory: &isDir])
+    {
+      if (isDir) return [resourcePath UTF8String];
+    }
+  return NULL;
 }
 
 void