Changeset 24557 for branches/eam_branches/20090522/extsrc/gpcsw/gpcsrc/fits/libfh/fh.c

Timestamp:

Jun 25, 2009, 2:00:56 PM (17 years ago)

Author:

eugene

Message:

merging changes from head

Location:

branches/eam_branches/20090522

Files:

• . (modified) (1 prop)
• extsrc/gpcsw (modified) (1 prop)
• extsrc/gpcsw/gpcsrc/fits/libfh/fh.c (modified) (9 diffs)

branches/eam_branches/20090522/extsrc/gpcsw

@@ -5 +5 @@
 man
 Makefile
+Makefile.bak

@@ -5 +5 @@
 man
 Makefile
+Makefile.bak

branches/eam_branches/20090522/extsrc/gpcsw/gpcsrc/fits/libfh/fh.c

@@ -200 +200 @@
 /* Functions that do file operations WITH RETRY: */
 static int write_file(int fd, const void* buf, int len);
-static int read_file(int fd, const void* buf, int len);
+static int read_file(int fd, void* buf, int len);
 static int seek_file(int fd, off_t off); /* Performs lseek(SEEK_SET) */
 static int fh_lock_file(HeaderUnit hu, int fd, fh_mode mode);
@@ -234 +234 @@
  * this information in debug mode.
  */
+const char* fh_rcs_version(void); /* proto to make gcc happy */
 const char* fh_rcs_version(void) { return rcs_id; }
 
@@ -274 +275 @@
 
 static void
-null_log(const char* s) { if (s) ; }
+null_log(const char* s) { if (s) return; }
 /*
  * It's also possible to pass a NULL to fh_log_xxx() and rely only on the
@@ -309 +310 @@
 
 HeaderUnit
-fh_create()
+fh_create(void)
 {
    HeaderUnitStruct* rtn; 
@@ -1941 +1942 @@
    HeaderUnitStruct* list = FH_HU(hu);
    char writebuf[FH_BLOCK_SIZE];
-   int i = 0, writelen;
+   int i = 0;
+   unsigned int writelen;
    int blocks_left;
    fh_result result;
@@ -2446 +2448 @@
    else /* byte-swapping case requires a temporary buffer */
    {
-      unsigned char outbuf[32768];
+      unsigned char* outbuf[32768];
 
       while (bytes_left)
@@ -2811 +2813 @@
    while (len)
    {
-      rtn = write(fd, (char*)buf, len);
+      rtn = write(fd, (const char*)buf, len);
+
+      switch (rtn)
+      {
+         case -1: if (errno == EINTR || errno == EAGAIN)
+            continue; /* retry */
+            return -1; /* permanent failure */
+         case 0: return count;
+         default:
+         {
+            len -= rtn;
+            count += rtn;
+            buf = (const char*)buf + rtn;
+         }
+      }
+   }
+   return count;
+}
+
+static int
+read_file(int fd, void* buf, int len)
+{
+   int rtn;
+   int count = 0;
+
+   while (len)
+   {
+      rtn = read(fd, (char*)buf, len);
 
       switch (rtn)
@@ -2831 +2860 @@
 
 static int
-read_file(int fd, const void* buf, int len)
-{
-   int rtn;
-   int count = 0;
-
-   while (len)
-   {
-      rtn = read(fd, (char*)buf, len);
-
-      switch (rtn)
-      {
-         case -1: if (errno == EINTR || errno == EAGAIN)
-            continue; /* retry */
-            return -1; /* permanent failure */
-         case 0: return count;
-         default:
-         {
-            len -= rtn;
-            count += rtn;
-            buf = (char*)buf + rtn;
-         }
-      }
-   }
-   return count;
-}
-
-static int
 seek_file(int fd, off_t off)
 {
@@ -2969 +2971 @@
 fh_compare(const void* a, const void* b)
 {
-   double diff = (*((FitsCard**)a))->idx - (*((FitsCard**)b))->idx;
+   double diff = (*((FitsCard* const*)a))->idx - (*((FitsCard* const*)b))->idx;
 
    if (diff < 0) return -1;

@@ -5 +5 @@
 man
 Makefile
+Makefile.bak