Changeset 13584 in project

Timestamp:

03/08/09 03:37:05 (11 years ago)

Author:

Kon Lovett

Message:

Save.

Location:

release/4/macosx/trunk

Files:

• macosx-env.scm (modified) (7 diffs)
• macosx-url.scm (modified) (1 diff)
• macosx.meta (modified) (1 diff)
• macosx.setup (modified) (1 diff)

release/4/macosx/trunk/macosx-env.scm

@@ -40 +40 @@
 cfsr_to_utf8str( CFStringRef cfsr, unsigned char **outstr )
 {
-#       define LONG_CHARS_PER_UTF8 6
+#       define LONG_CHARS_PER_UTF8 6 /* worst case assumption */
+
         CFIndex buflen = LONG_CHARS_PER_UTF8 * CFStringGetLength( cfsr) + 1;
+
         *outstr = (unsigned char *) C_malloc( buflen );
+
         if (! CFStringGetCString( cfsr, (char *) *outstr, buflen, kCFStringEncodingUTF8 )) {
                 C_free( *outstr );
                 *outstr = NULL;
         }
+
 #       undef LONG_CHARS_PER_UTF8
 }
@@ -71 +75 @@
 machine_location( double *lat, double *lon, int *dls, long *gmt )
 {
-#       define ROUNDN(v,p) (round((v) * ((p) * 10.0)) / ((p) * 10.0))
+#       define ROUNDN( v, p ) (round( (v) * ((p) * 10.0) ) / ((p) * 10.0))
+
         MachineLocation machloc;
+
         ReadLocation( &machloc );
+
         *lat = ROUNDN( ((double) FractToFloat( machloc.latitude)) * 90.0, 4 );
         *lon = ROUNDN( ((double) FractToFloat( machloc.longitude)) * 90.0, 4 );
         *dls = 0 < machloc.u.dls.Delta ? 3600 : (0 > machloc.u.dls.Delta ? -3600 : 0 );
         *gmt = ((machloc.u.gmtDelta & 0x00FFFFFF) << 8) >> 8;
+
 #       undef ROUNDN
 }
@@ -95 +103 @@
         uid_t uid;
         gid_t gid;
+
         CFStringRef cfsr = SCDynamicStoreCopyConsoleUser( store, &uid, &gid );
         cfsr_to_utf8str( cfsr, outstr );
         CFRelease( cfsr );
+
         *puid = uid;
         *pgid = gid;
@@ -126 +136 @@
     CFURLRef url = CFBundleCopyExecutableURL( bundle );
     if (NULL != url) {
-      long buflen = pathconf( "/", _PC_PATH_MAX ); /* Any pathname will do */
+      long buflen = pathconf( "/", _PC_PATH_MAX ); /* any pathname will do */
       *outstr = (unsigned char *) C_malloc( buflen );
       if (NULL != outstr) {
@@ -225 +235 @@
 (define (make-exn-osstatus-condition loc msg code . args)
   (make-composite-condition
-   (apply make-exn-condition loc msg . args)
+   (apply make-exn-condition loc msg args)
    (make-osstatus-condition code)) )
 
@@ -233 +243 @@
 (define (make-exn-oserr-condition loc msg code . args)
   (make-composite-condition
-   (apply make-exn-condition loc msg . args)
+   (apply make-exn-condition loc msg args)
    (make-oserr-condition code)) )
 
@@ -249 +259 @@
   (syntax-rules ()
     [(_ (?c-nam ?typ0 ...) ?arg0 ...)
-           (let-location ([outstr (c-pointer unsigned-c-string)])
+           (let-location ([outstr unsigned-c-string*])
              ((foreign-lambda void ?c-nam
-                                   (c-pointer unsigned-c-string) ?typ0 ...)
+                                   unsigned-c-string* ?typ0 ...)
               (location outstr) ?arg0 ...)
                    outstr ) ] ) )

release/4/macosx/trunk/macosx-url.scm

@@ -15 +15 @@
 
 #>
-#import <ApplicationServices/ApplicationServices.h>
-#import <CoreFoundation/CoreFoundation.h>
+#include <ApplicationServices/ApplicationServices.h>
+#include <CoreFoundation/CoreFoundation.h>
 
 static int

release/4/macosx/trunk/macosx.meta

@@ -7 +7 @@
  (doc-from-wiki)
  (synopsis "MacOS X Utilities")
- (needs setup-helper dollar)
+ (needs setup-helper)
  (files
   "tests"

release/4/macosx/trunk/macosx.setup

@@ -7 +7 @@
 (setup-shared-extension-module 'macosx-env (extension-version "2.0.0")
   compile-options: '(
-    -extend dollar
     -framework CoreFoundation -framework CoreServices
     -framework SystemConfiguration