From: <sm...@us...> - 2009-02-25 12:56:14
|
Revision: 9612 http://plplot.svn.sourceforge.net/plplot/?rev=9612&view=rev Author: smekal Date: 2009-02-25 12:56:05 +0000 (Wed, 25 Feb 2009) Log Message: ----------- Removed an unreferenced variable. Modified Paths: -------------- trunk/src/plstdio.c Modified: trunk/src/plstdio.c =================================================================== --- trunk/src/plstdio.c 2009-02-25 12:55:10 UTC (rev 9611) +++ trunk/src/plstdio.c 2009-02-25 12:56:05 UTC (rev 9612) @@ -108,7 +108,6 @@ void plio_fgets(char *buf, int size, FILE *stream) { - size_t bytes; char *s; dbug_enter("plio_fgets"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hba...@us...> - 2009-11-15 03:02:38
|
Revision: 10592 http://plplot.svn.sourceforge.net/plplot/?rev=10592&view=rev Author: hbabcock Date: 2009-11-15 03:02:30 +0000 (Sun, 15 Nov 2009) Log Message: ----------- Added missing flags variable. Modified Paths: -------------- trunk/src/plstdio.c Modified: trunk/src/plstdio.c =================================================================== --- trunk/src/plstdio.c 2009-11-15 02:17:14 UTC (rev 10591) +++ trunk/src/plstdio.c 2009-11-15 03:02:30 UTC (rev 10592) @@ -161,7 +161,7 @@ int pl_create_tempfile(char **fname) { - int fd; + int fd, flags; char *tmpdir; char *template; const char *tmpfile = "plplot_XXXXXX"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sm...@us...> - 2009-11-15 13:12:35
|
Revision: 10593 http://plplot.svn.sourceforge.net/plplot/?rev=10593&view=rev Author: smekal Date: 2009-11-15 13:12:20 +0000 (Sun, 15 Nov 2009) Log Message: ----------- For Visual C++ 2005 and later mktemp() and open() are deprecated (see http://msdn.microsoft.com/en-us/library/ms235413.aspx and http://msdn.microsoft.com/en-us/library/ms235491.aspx). mktemp() is redefined to _mktemp() as well as open() to _open(). In addition io.h is included. _S_IREAD and _S_IWRITE is only defined if undefined. Modified Paths: -------------- trunk/src/plstdio.c Modified: trunk/src/plstdio.c =================================================================== --- trunk/src/plstdio.c 2009-11-15 03:02:30 UTC (rev 10592) +++ trunk/src/plstdio.c 2009-11-15 13:12:20 UTC (rev 10593) @@ -32,7 +32,17 @@ #include <fcntl.h> #endif - +/* For Visual C++ 2005 and later mktemp() and open() are deprecated (see + * http://msdn.microsoft.com/en-us/library/ms235413.aspx and + * http://msdn.microsoft.com/en-us/library/ms235491.aspx). mktemp() + * is redefined to _mktemp() as well as open() to _open(). In addition + * we need to include io.h. + */ +#if defined ( _MSC_VER ) && _MSC_VER >= 1400 +#include <io.h> +#define mktemp _mktemp +#define open _open +#endif /* * plio_write() * @@ -203,8 +213,12 @@ if ( fd != -1 && fname != NULL ) unlink(template); #else +#if !defined(_S_IREAD) #define _S_IREAD 256 +#endif +#if !defined(_S_IWRITE) #define _S_IWRITE 128 +#endif fd = -1; flags = O_RDWR|O_BINARY|O_CREAT|O_EXCL|_O_SHORT_LIVED; /* If we are not returning the file name then add flag to automatically This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2009-11-16 13:18:30
|
Revision: 10600 http://plplot.svn.sourceforge.net/plplot/?rev=10600&view=rev Author: andrewross Date: 2009-11-16 13:18:18 +0000 (Mon, 16 Nov 2009) Log Message: ----------- Rename tmpfile to tmpname to avoid confusion with tmpfile function. Modified Paths: -------------- trunk/src/plstdio.c Modified: trunk/src/plstdio.c =================================================================== --- trunk/src/plstdio.c 2009-11-16 13:09:52 UTC (rev 10599) +++ trunk/src/plstdio.c 2009-11-16 13:18:18 UTC (rev 10600) @@ -176,7 +176,7 @@ FILE *fd; char *tmpdir; char *template; - const char *tmpfile = "plplot_XXXXXX"; + const char *tmpname = "plplot_XXXXXX"; #if defined ( MSDOS ) || defined ( WIN32 ) tmpdir = getenv( "TEMP" ); @@ -200,14 +200,14 @@ } /* N.B. Malloc ensures template is long enough so strcpy and strcat are safe here */ - template = (char *) malloc( sizeof ( char ) * ( strlen( tmpdir ) + strlen( tmpfile ) + 2 )); + template = (char *) malloc( sizeof ( char ) * ( strlen( tmpdir ) + strlen( tmpname ) + 2 )); strcpy( template, tmpdir ); #if defined ( MSDOS ) || defined ( WIN32 ) strcat( template, "\\" ); #else strcat( template, "/" ); #endif - strcat( template, tmpfile ); + strcat( template, tmpname ); #ifdef PL_HAVE_MKSTEMP fd = fdopen( mkstemp( template ), "wb" ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2009-12-09 08:56:16
|
Revision: 10712 http://plplot.svn.sourceforge.net/plplot/?rev=10712&view=rev Author: andrewross Date: 2009-12-09 08:56:03 +0000 (Wed, 09 Dec 2009) Log Message: ----------- Add in missing call to free in the error path. Modified Paths: -------------- trunk/src/plstdio.c Modified: trunk/src/plstdio.c =================================================================== --- trunk/src/plstdio.c 2009-12-08 08:05:06 UTC (rev 10711) +++ trunk/src/plstdio.c 2009-12-09 08:56:03 UTC (rev 10712) @@ -216,6 +216,7 @@ plwarn( "pl_create_tempfile: Unable to open temporary file - returning" ); if ( fname != NULL ) *fname = NULL; + free(template); return NULL; } /* If we are not returning the file name then unlink the file so it is This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arj...@us...> - 2011-11-02 07:43:31
|
Revision: 12022 http://plplot.svn.sourceforge.net/plplot/?rev=12022&view=rev Author: arjenmarkus Date: 2011-11-02 07:43:25 +0000 (Wed, 02 Nov 2011) Log Message: ----------- Variable flags is used even if the system does have an unlink() function. Therefore removed the preprocessor statements surrounding the declaration. Modified Paths: -------------- trunk/src/plstdio.c Modified: trunk/src/plstdio.c =================================================================== --- trunk/src/plstdio.c 2011-11-01 08:35:52 UTC (rev 12021) +++ trunk/src/plstdio.c 2011-11-02 07:43:25 UTC (rev 12022) @@ -176,9 +176,7 @@ const char *tmpdir; char *template; const char *tmpname = "plplot_XXXXXX"; -#ifndef PL_HAVE_UNLINK int flags; -#endif #if defined ( MSDOS ) || defined ( WIN32 ) tmpdir = getenv( "TEMP" ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2011-12-08 20:14:48
|
Revision: 12101 http://plplot.svn.sourceforge.net/plplot/?rev=12101&view=rev Author: andrewross Date: 2011-12-08 20:14:42 +0000 (Thu, 08 Dec 2011) Log Message: ----------- Fix extra warning introduced by previous removal of set but not used variable. Also fix typos in comments. Modified Paths: -------------- trunk/src/plstdio.c Modified: trunk/src/plstdio.c =================================================================== --- trunk/src/plstdio.c 2011-12-08 19:46:11 UTC (rev 12100) +++ trunk/src/plstdio.c 2011-12-08 20:14:42 UTC (rev 12101) @@ -74,7 +74,7 @@ } // -// plio_read() +// plio_fread() // // Read from stream into buf. Like plio_write(), this function will // handle any I/O error conditions. @@ -83,21 +83,23 @@ void plio_fread( void *buf, size_t size, size_t nmemb, FILE *stream ) { + size_t bytes; + dbug_enter( "plio_fread" ); // If the buffer has a size of zero, we should complain if ( size == 0 || nmemb == 0 ) { - plwarn( "Zero length buffer size in plio_read, returning" ); + plwarn( "Zero length buffer size in plio_fread, returning" ); return; } // Clear the error flag for this steam clearerr( stream ); - fread( buf, size, nmemb, stream ); + bytes = fread( buf, size, nmemb, stream ); - if ( ferror( stream ) ) + if ( (bytes < nmemb) && ferror( stream ) ) { // The read resulted in an error plabort( "Error reading from file" ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |