getdata-commits Mailing List for GetData (Page 12)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 660
          http://getdata.svn.sourceforge.net/getdata/?rev=660&view=rev
Author:   ketiltrout
Date:     2012-02-20 19:02:10 +0000 (Mon, 20 Feb 2012)
Log Message:
-----------
add "b" to appropriate f(d)open calls.

Modified Paths:
--------------
    trunk/getdata/src/ascii.c
    trunk/getdata/src/common.c
    trunk/getdata/src/flush.c
    trunk/getdata/src/include.c
    trunk/getdata/src/internal.h
    trunk/getdata/src/open.c
    trunk/getdata/src/putdata.c
    trunk/getdata/src/sie.c

Modified: trunk/getdata/src/ascii.c
===================================================================

--- trunk/getdata/src/ascii.c	2012-02-20 19:01:29 UTC (rev 659)
+++ trunk/getdata/src/ascii.c	2012-02-20 19:02:10 UTC (rev 660)
@@ -44,7 +44,7 @@
   } else
     file->idata = fd;
 
-  file->edata = fdopen(file->idata, (mode & GD_FILE_WRITE) ? "r+" : "r");
+  file->edata = fdopen(file->idata, (mode & GD_FILE_WRITE) ? "rb+" : "rb");
 
   if (file->edata == NULL) {
     close(file->idata);
@@ -375,7 +375,7 @@
     return -1;
   }
 
-  stream = fdopen(fd, "r");
+  stream = fdopen(fd, "rb");
 
   if (stream == NULL) {
     dreturn("%i", -1);

Modified: trunk/getdata/src/common.c
===================================================================
--- trunk/getdata/src/common.c	2012-02-20 19:01:29 UTC (rev 659)
+++ trunk/getdata/src/common.c	2012-02-20 19:02:10 UTC (rev 660)
@@ -277,7 +277,7 @@
     return;
   }
 
-  fp = fdopen(fd, "r");
+  fp = fdopen(fd, "rb");
   if (fp == NULL) {
     _GD_SetError(D, GD_E_OPEN_LINFILE, GD_E_LINFILE_OPEN, NULL, 0,
         E->EN(linterp,table));

Modified: trunk/getdata/src/flush.c
===================================================================
--- trunk/getdata/src/flush.c	2012-02-20 19:01:29 UTC (rev 659)
+++ trunk/getdata/src/flush.c	2012-02-20 19:02:10 UTC (rev 660)
@@ -593,7 +593,7 @@
     dreturnvoid();
     return;
   }
-  stream = fdopen(fd, "w+");
+  stream = fdopen(fd, "wb+");
   if (stream == NULL) {
     _GD_SetError(D, GD_E_FLUSH, GD_E_FLUSH_OPEN, NULL, errno, temp_file);
     dreturnvoid();

Modified: trunk/getdata/src/include.c
===================================================================
--- trunk/getdata/src/include.c	2012-02-20 19:01:29 UTC (rev 659)
+++ trunk/getdata/src/include.c	2012-02-20 19:02:10 UTC (rev 660)
@@ -176,7 +176,7 @@
     return -1;
   }
 
-  new_fp = fdopen(i, ((D->flags & GD_ACCMODE) == GD_RDWR) ? "r+" : "r");
+  new_fp = fdopen(i, ((D->flags & GD_ACCMODE) == GD_RDWR) ? "rb+" : "rb");
 
   /* If opening the file failed, set the error code and abort parsing. */
   if (new_fp == NULL) {

Modified: trunk/getdata/src/internal.h
===================================================================
--- trunk/getdata/src/internal.h	2012-02-20 19:01:29 UTC (rev 659)
+++ trunk/getdata/src/internal.h	2012-02-20 19:02:10 UTC (rev 660)
@@ -303,9 +303,6 @@
 #endif
 #ifndef O_TEXT
 #define O_TEXT 0
-#define FOPEN_TEXT
-#else
-#define FOPEN_TEXT "t"
 #endif
 
 /* The Microsoft CRT appears to treat %hh as %h */

Modified: trunk/getdata/src/open.c
===================================================================
--- trunk/getdata/src/open.c	2012-02-20 19:01:29 UTC (rev 659)
+++ trunk/getdata/src/open.c	2012-02-20 19:02:10 UTC (rev 660)
@@ -227,7 +227,7 @@
   }
 
   /* associate a stream with the format file */
-  if ((fp = fdopen(fd, "r")) == NULL) {
+  if ((fp = fdopen(fd, "rb")) == NULL) {
     char *format_file = (char *)malloc(strlen(dirfile) + 8);
     strcat(strcpy(format_file, dirfile), "/format");
     _GD_SetError(D, GD_E_CREAT, GD_E_CREAT_FORMAT, format_file, errno, NULL);

Modified: trunk/getdata/src/putdata.c
===================================================================
--- trunk/getdata/src/putdata.c	2012-02-20 19:01:29 UTC (rev 659)
+++ trunk/getdata/src/putdata.c	2012-02-20 19:02:10 UTC (rev 660)
@@ -511,14 +511,14 @@
 #define MPLEX(t) \
   for (i = 0; i < n; i++) \
     if (B[i] == val) \
-      ((t*)A)[i] = ((t*)C)[i];
+      ((t*)A)[i] = ((t*)C)[i * spfB / spfA];
 
 #define MPLEXC(t) \
   do { \
     for (i = 0; i < n; i++) \
       if (B[i] == val) { \
-        ((t*)A)[i * 2] = ((t*)C)[i * 2]; \
-        ((t*)A)[i * 2 + 1] = ((t*)C)[i * 2 + 1]; \
+        ((t*)A)[i * 2] = ((t*)C)[i * spfB / spfA]; \
+        ((t*)A)[i * 2 + 1] = ((t*)C)[i * spfB / spfA + 1]; \
       } \
   } while (0)
 

Modified: trunk/getdata/src/sie.c
===================================================================
--- trunk/getdata/src/sie.c	2012-02-20 19:01:29 UTC (rev 659)
+++ trunk/getdata/src/sie.c	2012-02-20 19:02:10 UTC (rev 660)
@@ -48,7 +48,7 @@
   } else
     fd = fdin;
 
-  stream = fdopen(fd, (mode & GD_FILE_WRITE) ? "r+" : "r");
+  stream = fdopen(fd, (mode & GD_FILE_WRITE) ? "rb+" : "rb");
 
   if (stream == NULL) {
     close(fd);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2010	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (5)	Oct (20)	Nov (21)	Dec (16)
2011	Jan (1)	Feb (1)	Mar (56)	Apr (20)	May (4)	Jun (2)	Jul (3)	Aug (11)	Sep (2)	Oct (4)	Nov (18)	Dec (16)
2012	Jan (8)	Feb (12)	Mar (30)	Apr (13)	May (10)	Jun (17)	Jul (18)	Aug (19)	Sep	Oct (1)	Nov (1)	Dec (9)
2013	Jan (1)	Feb (4)	Mar (27)	Apr (6)	May (3)	Jun (1)	Jul (10)	Aug	Sep (3)	Oct (15)	Nov (4)	Dec (9)
2014	Jan	Feb (3)	Mar (4)	Apr (10)	May (15)	Jun	Jul (14)	Aug	Sep (2)	Oct (6)	Nov	Dec (9)
2015	Jan (2)	Feb (3)	Mar (1)	Apr (2)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

getdata-commits Mailing List for GetData (Page 12)

Scientific Database Format

getdata-commits — An automated log of GetData Subversion activity.