Changeset 462 for branches/samba-3.3.x/source/lib

Timestamp:

Jun 9, 2010, 6:20:03 PM (15 years ago)

Author:

Herwig Bauernfeind

Message:

os2helper.c cosmetic changes

File:

• branches/samba-3.3.x/source/lib/os2helper.c (modified) (6 diffs)

branches/samba-3.3.x/source/lib/os2helper.c

@@ -1 @@
-/* This file contains helper functions for OS/2 - don't try and compile on other platforms */
+/* This file contains helper functions for OS/2 - 
+   do not try to compile on other platforms! */
 
 #ifdef __OS2__
@@ -20 +21 @@
 #include <malloc.h>
 
-/* these define the attribute byte as seen by DOS */
-#define aRONLY (1L<<0)          /* 0x01 */
-#define aHIDDEN (1L<<1)         /* 0x02 */
-#define aSYSTEM (1L<<2)         /* 0x04 */
-#define aVOLID (1L<<3)          /* 0x08 */
-#define aDIR (1L<<4)            /* 0x10 */
-#define aARCH (1L<<5)           /* 0x20 */
+// these define the attribute byte as seen by DOS 
+#define aRONLY (1L<<0)   /* 0x01 */
+#define aHIDDEN (1L<<1)  /* 0x02 */
+#define aSYSTEM (1L<<2)  /* 0x04 */
+#define aVOLID (1L<<3)   /* 0x08 */
+#define aDIR (1L<<4)     /* 0x10 */
+#define aARCH (1L<<5)    /* 0x20 */
 
 #ifndef TESTING
@@ -49 +50 @@
 int os2_ftruncate(int fd, off_t size)
 {
-        // We call there __libc_Back_ioFileSizeSet directly instead of 
-        // ftruncate to force it not to zero expanding files to optimize
-        // samba performance when copying files
+        /* We call __libc_Back_ioFileSizeSet directly instead of 
+           ftruncate to force it not to zero expanding files to 
+           optimize Samba performance when copying files */
+
         int rc = __libc_Back_ioFileSizeSet(fd, size, 0);
         if (rc < 0)
@@ -63 +65 @@
 int os2_isattribute(char *path, unsigned short attr)
 {
-    HDIR          hdirFindHandle = HDIR_CREATE;
-    FILEFINDBUF3  FindBuffer     = {0};      /* Returned from FindFirst/Next */
-    USHORT        dosattr;                      /* attribute to search for */
-    ULONG         ulResultBufLen = sizeof(FILEFINDBUF3);
-    ULONG         ulFindCount    = 1;        /* Look for 1 file at a time    */
-    APIRET        rc             = NO_ERROR; /* Return code                  */
-    if (attr==aARCH) 
-                        dosattr=MUST_HAVE_ARCHIVED;
-    else if (attr==aRONLY)
-                        dosattr=MUST_HAVE_READONLY;
-    else if (attr==aSYSTEM)
-                        dosattr=MUST_HAVE_SYSTEM;
-    else if (attr==aHIDDEN)
-                        dosattr=MUST_HAVE_HIDDEN;
-
-    rc = DosFindFirst( path,                /* File pattern - all files     */
-                       &hdirFindHandle,      /* Directory search handle      */
-                        dosattr,
-                       &FindBuffer,          /* Result buffer                */
-                       ulResultBufLen,       /* Result buffer length         */
-                       &ulFindCount,         /* Number of entries to find    */
-                       FIL_STANDARD);        /* Return Level 1 file info     */
-
-   if (rc != NO_ERROR) {
-         rc = DosFindClose(hdirFindHandle);    /* Close our directory handle */
-       return 1;
-
-    } else {
-         rc = DosFindClose(hdirFindHandle);    /* Close our directory handle */
-        return 0;
-
-    } /* endif */
-
+        HDIR          hdirFindHandle = HDIR_CREATE;
+        FILEFINDBUF3  FindBuffer     = {0};      /* Returned from FindFirst/Next */
+        USHORT        dosattr;                   /* attribute to search for      */
+        ULONG         ulResultBufLen = sizeof(FILEFINDBUF3);
+        ULONG         ulFindCount    = 1;        /* Look for 1 file at a time    */
+        APIRET        rc             = NO_ERROR; /* Return code                  */
+        if (attr==aARCH) 
+                dosattr=MUST_HAVE_ARCHIVED;
+        else if (attr==aRONLY)
+                dosattr=MUST_HAVE_READONLY;
+        else if (attr==aSYSTEM)
+                dosattr=MUST_HAVE_SYSTEM;
+        else if (attr==aHIDDEN)
+                dosattr=MUST_HAVE_HIDDEN;
+
+        rc = DosFindFirst(  path,                 /* File pattern - all files     */
+                                                &hdirFindHandle,      /* Directory search handle      */
+                                                dosattr,
+                                                &FindBuffer,          /* Result buffer                */
+                                                ulResultBufLen,       /* Result buffer length         */
+                                                &ulFindCount,         /* Number of entries to find    */
+                                                FIL_STANDARD);        /* Return Level 1 file info     */
+
+        if (rc != NO_ERROR) {
+                rc = DosFindClose(hdirFindHandle);    /* Close our directory handle */
+                return 1;
+        } else {
+                rc = DosFindClose(hdirFindHandle);    /* Close our directory handle */
+                return 0;
+        } /* endif */
 }
 
@@ -129 +128 @@
 }
 
-/* os2 specific random functions. this functions used to be based on APR random code.
-   but we discovered some nasty problems with it on fast hardware (especially on quadcore) and
-   decided to rewrite it with libc random() */
+/* OS/2-specific random functions. these functions used to be based on APR 
+   random code, but we discovered some nasty problems with it on fast hardware
+   (especially on quadcore) and decided to rewrite it with libc random() */
 
 void os2_randget(char * buffer, int length)
 {
-    UCHAR randbyte();
-    unsigned int idx;
-
-    for (idx=0; idx<length; idx++)
+        UCHAR randbyte();
+        unsigned int idx;
+
+        for (idx=0; idx<length; idx++)
         buffer[idx] = randbyte();
 
@@ -145 +144 @@
 UCHAR randbyte()
 {
-     int c;
-     UCHAR byte;
-     ULONG ulrandom;
+        int c;
+        UCHAR byte;
+        ULONG ulrandom;
         ulrandom = random();
+        
         for (c = 0; c < sizeof(ulrandom); c++) {
                 byte ^= ((UCHAR *)&ulrandom)[c];
         }
 
-    return byte;
+        return byte;
 }