plplot-cvs Mailing List for PLplot (Page 18)

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

Revision: 12714
          http://sourceforge.net/p/plplot/code/12714
Author:   airwin
Date:     2013-11-18 21:54:26 +0000 (Mon, 18 Nov 2013)
Log Message:
-----------
Style previous commits.

Modified Paths:
--------------
    trunk/bindings/tk/plserver.c
    trunk/drivers/tk.c
    trunk/src/plstdio.c

Modified: trunk/bindings/tk/plserver.c
===================================================================

--- trunk/bindings/tk/plserver.c	2013-11-18 21:45:22 UTC (rev 12713)
+++ trunk/bindings/tk/plserver.c	2013-11-18 21:54:26 UTC (rev 12714)
@@ -115,7 +115,7 @@
 
 // Save arglist to get around Tk_ParseArgv limitations
 
-    myargv = (const char **) malloc( argc * sizeof(char *) );
+    myargv = (const char **) malloc( argc * sizeof ( char * ) );
     for ( i = 0; i < argc; i++ )
     {
         myargv[i] = argv[i];

Modified: trunk/drivers/tk.c
===================================================================
--- trunk/drivers/tk.c	2013-11-18 21:45:22 UTC (rev 12713)
+++ trunk/drivers/tk.c	2013-11-18 21:54:26 UTC (rev 12714)
@@ -1518,10 +1518,10 @@
 static void
 link_init( PLStream *pls )
 {
-    TkDev   *dev   = (TkDev *) pls->dev;
-    PLiodev *iodev = (PLiodev *) dev->iodev;
-    size_t  bufmax = (size_t) ( pls->bufmax * 1.2 );
-    char *dirname = NULL;
+    TkDev   *dev     = (TkDev *) pls->dev;
+    PLiodev *iodev   = (PLiodev *) dev->iodev;
+    size_t  bufmax   = (size_t) ( pls->bufmax * 1.2 );
+    char    *dirname = NULL;
 
     dbug_enter( "link_init" );
 
@@ -1529,11 +1529,11 @@
 
     if ( !pls->dp )
     {
-        // This uses the pl_create_tempfifo function to create 
+        // This uses the pl_create_tempfifo function to create
         // the fifo in a safe manner by first creating a private
         // temporary directory.
         iodev->fileName = pl_create_tempfifo( (char **) &iodev->fileName, &dirname );
-        if ( dirname == NULL || iodev->fileName == NULL ) 
+        if ( dirname == NULL || iodev->fileName == NULL )
             abort_session( pls, "mkfifo error" );
 
         // Tell plframe widget to open FIFO (for reading).
@@ -1556,7 +1556,7 @@
 // Unlink FIFO so that it isn't left around if program crashes.
 // This also ensures no other program can mess with it.
 
-        if ( unlink( iodev->fileName) == -1 )
+        if ( unlink( iodev->fileName ) == -1 )
             abort_session( pls, "Error removing fifo" );
         if ( rmdir( dirname ) == -1 )
             abort_session( pls, "Error removing temporary directory" );

Modified: trunk/src/plstdio.c
===================================================================
--- trunk/src/plstdio.c	2013-11-18 21:45:22 UTC (rev 12713)
+++ trunk/src/plstdio.c	2013-11-18 21:54:26 UTC (rev 12714)
@@ -260,12 +260,12 @@
 // pl_create_tempfifo()
 //
 // Securely create a temporary fifo and return the file name.
-// This only works on POSIX compliant platforms at the moment. 
-// It creates a secure directory first using mkdtemp, then 
-// creates the named fifo in this directory. The combination of 
+// This only works on POSIX compliant platforms at the moment.
+// It creates a secure directory first using mkdtemp, then
+// creates the named fifo in this directory. The combination of
 // a private directory and mkfifo failing if the file name already exists
 // makes this secure against race conditions / DoS attacks. This function
-// includes additional functionality over mkdtemp in that it honours the 
+// includes additional functionality over mkdtemp in that it honours the
 // TMP / TMPDIR / TEMP environment variables.
 //
 // The function returns the file name of the fifo.
@@ -274,14 +274,14 @@
 pl_create_tempfifo( char **p_fifoname, char **p_dirname )
 {
 #if !defined PL_HAVE_MKDTEMP || !defined PL_HAVE_MKFIFO
-    plwarn("Creating fifos not supported on this platform");
+    plwarn( "Creating fifos not supported on this platform" );
     return NULL;
-#else 
+#else
     FILE       *fd;
     const char *tmpdir;
-    char *template;
-    char *dirname;
-    const char *tmpname = "plplot_dir_XXXXXX";
+    char       *template;
+    char       *dirname;
+    const char *tmpname  = "plplot_dir_XXXXXX";
     const char *fifoname = "plplot_fifo";
     int        flags;
 
@@ -316,11 +316,11 @@
 #endif
     strcat( dirname, tmpname );
     // Create the temporary directory
-    dirname = mkdtemp( dirname );
+    dirname    = mkdtemp( dirname );
     *p_dirname = dirname;
 
     // Now create the fifo in the directory
-    template = (char *) malloc( sizeof ( char ) * ( strlen( tmpdir ) + strlen( tmpname ) + strlen(fifoname) + 4 ) );
+    template = (char *) malloc( sizeof ( char ) * ( strlen( tmpdir ) + strlen( tmpname ) + strlen( fifoname ) + 4 ) );
     strcpy( template, dirname );
 #if defined ( MSDOS ) || defined ( WIN32 )
     strcat( template, "\\" );
@@ -331,13 +331,14 @@
     *p_fifoname = template;
 
     // Check that mkfifo succeeds safely
-    if ( mkfifo( template, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH ) < 0 ) {
-         plwarn( "mkfifo error" );
-         free( template );
-         *p_fifoname = NULL;
-         free( dirname );
-         *p_dirname = NULL;
-         return NULL;
+    if ( mkfifo( template, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH ) < 0 )
+    {
+        plwarn( "mkfifo error" );
+        free( template );
+        *p_fifoname = NULL;
+        free( dirname );
+        *p_dirname = NULL;
+        return NULL;
     }
 
     return template;

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





2000	Jan	Feb	Mar	Apr	May (33)	Jun	Jul (30)	Aug (2)	Sep	Oct (30)	Nov (136)	Dec (59)
2001	Jan (255)	Feb (169)	Mar (322)	Apr (185)	May (33)	Jun (89)	Jul (47)	Aug (59)	Sep (40)	Oct (31)	Nov (74)	Dec (84)
2002	Jan (163)	Feb (78)	Mar (23)	Apr (5)	May (22)	Jun (75)	Jul (143)	Aug (48)	Sep (111)	Oct (58)	Nov (124)	Dec (278)
2003	Jan (106)	Feb (276)	Mar (354)	Apr (97)	May (14)	Jun (3)	Jul (7)	Aug (21)	Sep (83)	Oct (110)	Nov (3)	Dec (119)
2004	Jan (318)	Feb (409)	Mar (68)	Apr (23)	May (105)	Jun (147)	Jul (69)	Aug (53)	Sep (23)	Oct (14)	Nov (15)	Dec (63)
2005	Jan (146)	Feb (69)	Mar (157)	Apr (127)	May (166)	Jun (8)	Jul (5)	Aug (3)	Sep (8)	Oct (17)	Nov (29)	Dec (34)
2006	Jan (3)	Feb (4)	Mar (1)	Apr (70)	May (241)	Jun (82)	Jul (344)	Aug (196)	Sep (87)	Oct (57)	Nov (121)	Dec (86)
2007	Jan (60)	Feb (67)	Mar (102)	Apr (28)	May (13)	Jun (29)	Jul (38)	Aug (56)	Sep (91)	Oct (89)	Nov (50)	Dec (68)
2008	Jan (87)	Feb (47)	Mar (100)	Apr (34)	May (65)	Jun (54)	Jul (98)	Aug (128)	Sep (109)	Oct (141)	Nov (40)	Dec (206)
2009	Jan (176)	Feb (226)	Mar (134)	Apr (84)	May (152)	Jun (85)	Jul (91)	Aug (153)	Sep (141)	Oct (59)	Nov (87)	Dec (75)
2010	Jan (58)	Feb (41)	Mar (51)	Apr (74)	May (81)	Jun (39)	Jul (30)	Aug (43)	Sep (76)	Oct (59)	Nov (62)	Dec (52)
2011	Jan (125)	Feb (41)	Mar (96)	Apr (53)	May (21)	Jun (23)	Jul (48)	Aug (71)	Sep (37)	Oct (81)	Nov (60)	Dec (32)
2012	Jan (51)	Feb (23)	Mar	Apr (8)	May (2)	Jun	Jul (8)	Aug (25)	Sep (4)	Oct (32)	Nov (17)	Dec (2)
2013	Jan (8)	Feb (2)	Mar (9)	Apr (9)	May (37)	Jun (48)	Jul (63)	Aug (42)	Sep (59)	Oct (83)	Nov (141)	Dec (133)
2014	Jan (57)	Feb (58)	Mar (58)	Apr (25)	May (14)	Jun (3)	Jul (6)	Aug (1)	Sep	Oct	Nov	Dec

plplot-cvs Mailing List for PLplot (Page 18)

Cross-platform, scientific graphics plotting library

plplot-cvs — For PLplot svn commit messages