[Plplot-cvs] SF.net SVN: plplot:[10465] trunk/src

[<ai...@us...>]

Revision: 10465
          http://plplot.svn.sourceforge.net/plplot/?rev=10465&view=rev
Author:   airwin
Date:     2009-09-23 22:25:49 +0000 (Wed, 23 Sep 2009)

Log Message:
-----------
Result of applying uncrustify version 0.53 again on top of Andrew's result
with the svn/trunk version of uncrustify.cfg.  Andrew is also using 0.53
so this is an attempt to see whether one more uncrustify run from him will
cause any further differences.

Modified Paths:
--------------
    trunk/src/plbox.c
    trunk/src/plbuf.c
    trunk/src/plcore.c
    trunk/src/plot3d.c
    trunk/src/plstripc.c

Modified: trunk/src/plbox.c
===================================================================
--- trunk/src/plbox.c	2009-09-23 20:57:49 UTC (rev 10464)
+++ trunk/src/plbox.c	2009-09-23 22:25:49 UTC (rev 10465)
@@ -1613,7 +1613,7 @@
         {
             plwarn(
                 "Custom axis labels requested without a labeling function \
-                    - using default."                                                                             );
+                    - using default." );
         }
         if ( ll )
         {

Modified: trunk/src/plbuf.c
===================================================================
--- trunk/src/plbuf.c	2009-09-23 20:57:49 UTC (rev 10464)
+++ trunk/src/plbuf.c	2009-09-23 22:25:49 UTC (rev 10465)
@@ -759,7 +759,8 @@
                (unsigned short *) malloc(( nptsX -
                                            1 ) *
                                          ( nptsY -
-                                           1 ) * sizeof ( unsigned short ))) == NULL ))
+                                           1 ) * sizeof ( unsigned short ))) ==
+         NULL ))
         plexit( "rdbuf_image: Insufficient memory" );
 
     rd_data( pls, dev_ix, sizeof ( short ) * npts );

Modified: trunk/src/plcore.c
===================================================================
--- trunk/src/plcore.c	2009-09-23 20:57:49 UTC (rev 10464)
+++ trunk/src/plcore.c	2009-09-23 22:25:49 UTC (rev 10465)
@@ -535,16 +535,16 @@
      */
 #define N_TextLookupTable    10
     const TextLookupTable lookup[N_TextLookupTable] = {
-        { "<sans-serif/>", PL_FCI_SANS,       PL_FCI_FAMILY          },
-        { "<serif/>",      PL_FCI_SERIF,      PL_FCI_FAMILY          },
-        { "<monospace/>",  PL_FCI_MONO,       PL_FCI_FAMILY          },
-        { "<script/>",     PL_FCI_SCRIPT,     PL_FCI_FAMILY          },
-        { "<symbol/>",     PL_FCI_SYMBOL,     PL_FCI_FAMILY          },
-        { "<upright/>",    PL_FCI_UPRIGHT,    PL_FCI_STYLE           },
-        { "<italic/>",     PL_FCI_ITALIC,     PL_FCI_STYLE           },
-        { "<oblique/>",    PL_FCI_OBLIQUE,    PL_FCI_STYLE           },
-        { "<medium/>",     PL_FCI_MEDIUM,     PL_FCI_WEIGHT          },
-        { "<bold/>",       PL_FCI_BOLD,       PL_FCI_WEIGHT          }
+        { "<sans-serif/>", PL_FCI_SANS,    PL_FCI_FAMILY },
+        { "<serif/>",      PL_FCI_SERIF,   PL_FCI_FAMILY },
+        { "<monospace/>",  PL_FCI_MONO,    PL_FCI_FAMILY },
+        { "<script/>",     PL_FCI_SCRIPT,  PL_FCI_FAMILY },
+        { "<symbol/>",     PL_FCI_SYMBOL,  PL_FCI_FAMILY },
+        { "<upright/>",    PL_FCI_UPRIGHT, PL_FCI_STYLE  },
+        { "<italic/>",     PL_FCI_ITALIC,  PL_FCI_STYLE  },
+        { "<oblique/>",    PL_FCI_OBLIQUE, PL_FCI_STYLE  },
+        { "<medium/>",     PL_FCI_MEDIUM,  PL_FCI_WEIGHT },
+        { "<bold/>",       PL_FCI_BOLD,    PL_FCI_WEIGHT }
     };
     int                   i, length;
     for ( i = 0; i < N_TextLookupTable; i++ )

Modified: trunk/src/plot3d.c
===================================================================
--- trunk/src/plot3d.c	2009-09-23 20:57:49 UTC (rev 10464)
+++ trunk/src/plot3d.c	2009-09-23 22:25:49 UTC (rev 10465)
@@ -762,7 +762,7 @@
     }
 
     if ( opt & DRAW_SIDES ) /* the sides look ugly !!! */
-    { /* draw one more row with all the Z's set to zmin */
+    {                       /* draw one more row with all the Z's set to zmin */
         PLFLT zscale, zmin, zmax;
 
         plP_grange( &zscale, &zmin, &zmax );
@@ -1046,7 +1046,8 @@
                 _z[i][0] = z[ixmin][iymin] *
                            ( 1 -
                              ty0 ) *
-                           ( 1 - tx0 ) + z[ixmin][iymin + 1] * ( 1 - tx0 ) * ty0
+                           ( 1 -
+                             tx0 ) + z[ixmin][iymin + 1] * ( 1 - tx0 ) * ty0
                            + z[ixmin +
                                1][iymin] * tx0 *
                            ( 1 - ty0 ) + z[ixmin + 1][iymin + 1] * tx0 * ty0;

Modified: trunk/src/plstripc.c
===================================================================
--- trunk/src/plstripc.c	2009-09-23 20:57:49 UTC (rev 10464)
+++ trunk/src/plstripc.c	2009-09-23 22:25:49 UTC (rev 10465)
@@ -112,7 +112,7 @@
         stripc->legline[i] = plstrdup( legline[i] );
         stripc->x[i]       = (PLFLT *) malloc(
             (size_t) sizeof ( PLFLT ) * stripc->nptsmax[i] );;
-        stripc->y[i]       = (PLFLT *) malloc(
+        stripc->y[i] = (PLFLT *) malloc(
             (size_t) sizeof ( PLFLT ) * stripc->nptsmax[i] );;
         if ( stripc->x[i] == NULL || stripc->y[i] == NULL )
         {


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