From: <ai...@us...> - 2009-09-23 23:34:19
|
Revision: 10467 http://plplot.svn.sourceforge.net/plplot/?rev=10467&view=rev Author: airwin Date: 2009-09-23 23:34:11 +0000 (Wed, 23 Sep 2009) Log Message: ----------- Reduce indentation of wrapped argument lists for functions. I have only spot checked this change in style, but it really makes a positive improvement for those cases where the function call is way to the right in the line. Furthermore, "svn diff -x -w" shows there are no changes other than white space ones. Modified Paths: -------------- trunk/src/pdfutils.c trunk/src/plarc.c trunk/src/plargs.c trunk/src/plbox.c trunk/src/plbuf.c trunk/src/plcont.c trunk/src/plcore.c trunk/src/plctrl.c trunk/src/pldeprecated.c trunk/src/pldtik.c trunk/src/plfill.c trunk/src/plfreetype.c trunk/src/plgridd.c trunk/src/plhist.c trunk/src/plimage.c trunk/src/plline.c trunk/src/plmap.c trunk/src/plot3d.c trunk/src/plpage.c trunk/src/plsdef.c trunk/src/plshade.c trunk/src/plstripc.c trunk/src/plsym.c trunk/src/pltime.c trunk/src/plvect.c trunk/src/plvpor.c trunk/src/plwind.c trunk/uncrustify.cfg Modified: trunk/src/pdfutils.c =================================================================== --- trunk/src/pdfutils.c 2009-09-23 22:33:33 UTC (rev 10466) +++ trunk/src/pdfutils.c 2009-09-23 23:34:11 UTC (rev 10467) @@ -108,7 +108,7 @@ if ( binary ) { Tcl_SetChannelOption( NULL, pdfs->tclChan, "-translation", - "binary" ); + "binary" ); } } } @@ -263,11 +263,11 @@ if ( pdfs->bp >= pdfs->bufmax ) { pldebug( "pdf_putc", - "Increasing buffer to %d bytes\n", pdfs->bufmax ); + "Increasing buffer to %d bytes\n", pdfs->bufmax ); pdfs->bufmax += 512; if (( pdfs->buffer = (U_CHAR *) realloc((void *) pdfs->buffer, - pdfs->bufmax )) == NULL ) + pdfs->bufmax )) == NULL ) { plexit( "pdf_putc: Insufficient memory" ); } @@ -384,11 +384,11 @@ if ( pdfs->bp >= pdfs->bufmax ) { pldebug( "pdf_wrx", - "Increasing buffer to %d bytes\n", pdfs->bufmax ); + "Increasing buffer to %d bytes\n", pdfs->bufmax ); pdfs->bufmax += 512; if (( pdfs->buffer = (U_CHAR *) realloc((void *) ( pdfs->buffer ), - pdfs->bufmax )) == NULL ) + pdfs->bufmax )) == NULL ) { plexit( "pdf_wrx: Insufficient memory" ); } Modified: trunk/src/plarc.c =================================================================== --- trunk/src/plarc.c 2009-09-23 22:33:33 UTC (rev 10466) +++ trunk/src/plarc.c 2009-09-23 23:34:11 UTC (rev 10467) @@ -35,12 +35,12 @@ *-------------------------------------------------------------------------*/ void plarc_approx( PLFLT x, - PLFLT y, - PLFLT a, - PLFLT b, - PLFLT angle1, - PLFLT angle2, - PLBOOL fill ) + PLFLT y, + PLFLT a, + PLFLT b, + PLFLT angle1, + PLFLT angle2, + PLBOOL fill ) { PLINT i; PLFLT theta0, theta_step, theta, d_angle; @@ -112,12 +112,12 @@ *-------------------------------------------------------------------------*/ void c_plarc( PLFLT x, - PLFLT y, - PLFLT a, - PLFLT b, - PLFLT angle1, - PLFLT angle2, - PLBOOL fill ) + PLFLT y, + PLFLT a, + PLFLT b, + PLFLT angle1, + PLFLT angle2, + PLBOOL fill ) { PLINT xscl[2], yscl[2]; PLINT clpxmi, clpxma, clpymi, clpyma; Modified: trunk/src/plargs.c =================================================================== --- trunk/src/plargs.c 2009-09-23 22:33:33 UTC (rev 10466) +++ trunk/src/plargs.c 2009-09-23 23:34:11 UTC (rev 10467) @@ -101,15 +101,15 @@ /* Support functions */ static int ParseOpt( int *, - const char ***, - int *, - const char ***, - PLOptionTable * ); + const char ***, + int *, + const char ***, + PLOptionTable * ); static int ProcessOpt( const char *, - PLOptionTable *, - int *, - const char ***, - int * ); + PLOptionTable *, + int *, + const char ***, + int * ); static int GetOptarg( const char **, int *, const char ***, int * ); static void Help( void ); static void Syntax( void ); @@ -877,7 +877,7 @@ /* Check option table for option */ status = ParseOpt( &myargc, &argv, p_argc, &argsave, - ploption_info[i].options ); + ploption_info[i].options ); if ( !status ) break; } @@ -948,10 +948,10 @@ static int ParseOpt( int *p_myargc, - const char ***p_argv, - int *p_argc, - const char ***p_argsave, - PLOptionTable *option_table ) + const char ***p_argv, + int *p_argc, + const char ***p_argsave, + PLOptionTable *option_table ) { PLOptionTable *tab; const char *opt; @@ -1003,10 +1003,10 @@ static int ProcessOpt( const char *opt, - PLOptionTable *tab, - int *p_myargc, - const char ***p_argv, - int *p_argc ) + PLOptionTable *tab, + int *p_myargc, + const char ***p_argv, + int *p_argc ) { int need_arg, res; const char *optarg = NULL; @@ -1032,8 +1032,8 @@ if ( tab->handler == NULL ) { fprintf( stderr, - "ProcessOpt: no handler specified for option %s\n", - tab->opt ); + "ProcessOpt: no handler specified for option %s\n", + tab->opt ); return 1; } @@ -1065,8 +1065,8 @@ if ( tab->var == NULL ) { fprintf( stderr, - "ProcessOpt: no variable specified for option %s\n", - tab->opt ); + "ProcessOpt: no variable specified for option %s\n", + tab->opt ); return 1; } *(int *) tab->var = 1; @@ -1079,8 +1079,8 @@ if ( tab->var == NULL ) { fprintf( stderr, - "ProcessOpt: no variable specified for option %s\n", - tab->opt ); + "ProcessOpt: no variable specified for option %s\n", + tab->opt ); return 1; } *(int *) tab->var = atoi( optarg ); @@ -1093,8 +1093,8 @@ if ( tab->var == NULL ) { fprintf( stderr, - "ProcessOpt: no variable specified for option %s\n", - tab->opt ); + "ProcessOpt: no variable specified for option %s\n", + tab->opt ); return 1; } *(PLFLT *) tab->var = atof( optarg ); @@ -1112,8 +1112,8 @@ /* Somebody messed up.. */ fprintf( stderr, - "ProcessOpt: invalid processing mode for option %s\n", - tab->opt ); + "ProcessOpt: invalid processing mode for option %s\n", + tab->opt ); return 1; } return 0; @@ -1128,9 +1128,9 @@ static int GetOptarg( const char **poptarg, - int *p_myargc, - const char ***p_argv, - int *p_argc ) + int *p_myargc, + const char ***p_argv, + int *p_argc ) { int result = 0; @@ -1159,8 +1159,8 @@ if ( !mode_quiet ) { fprintf( stderr, - "Argument missing for %s option.\n", - ( *p_argv )[0] ); + "Argument missing for %s option.\n", + ( *p_argv )[0] ); plOptUsage(); } } @@ -1200,7 +1200,7 @@ Syntax(); fprintf( stderr, "\n\nType %s -h for a full description.\n\n", - program ); + program ); } /*--------------------------------------------------------------------------*\ @@ -1366,7 +1366,7 @@ *(char **) ( t->var_ptr ) = ( drvp->value ); #ifdef DEBUG fprintf( stderr, "plParseDrvOpts: %s %s\n", t->opt, - *(char**) t->var_ptr ); + *(char**) t->var_ptr ); #endif break; @@ -1374,16 +1374,16 @@ if ( sscanf( drvp->value, "%d", (int *) t->var_ptr ) != 1 ) { snprintf( msg, - sizeof ( msg ) - 1, - "Incorrect argument to '%s' option", - drvp->option ); + sizeof ( msg ) - 1, + "Incorrect argument to '%s' option", + drvp->option ); plexit( msg ); } #ifdef DEBUG fprintf( stderr, - "plParseDrvOpts: %s %d\n", - t->opt, - *(int *) t->var_ptr ); + "plParseDrvOpts: %s %d\n", + t->opt, + *(int *) t->var_ptr ); #endif break; @@ -1391,14 +1391,14 @@ if ( sscanf( drvp->value, "%f", (float *) t->var_ptr ) != 1 ) { snprintf( msg, - sizeof ( msg ) - 1, - "Incorrect argument to '%s' option", - drvp->option ); + sizeof ( msg ) - 1, + "Incorrect argument to '%s' option", + drvp->option ); plexit( msg ); } #ifdef DEBUG fprintf( stderr, "plParseDrvOpts: %s %f\n", t->opt, - *(float *) t->var_ptr ); + *(float *) t->var_ptr ); #endif break; } @@ -1786,8 +1786,8 @@ default: fprintf( stderr, - "Unrecognized background color value %s\n", - color_field ); + "Unrecognized background color value %s\n", + color_field ); return 1; } @@ -2018,8 +2018,8 @@ if ( bytemax <= 0 ) { fprintf( stderr, - "?invalid file size %d. 2.14G is the maximum.\n", - bytemax ); + "?invalid file size %d. 2.14G is the maximum.\n", + bytemax ); return 1; } plsfam( 1, -1, bytemax ); @@ -2170,7 +2170,7 @@ if (( plsc->plwindow = (char *) malloc((size_t) ( 1 + strlen( optarg )) * - sizeof ( char ))) == NULL ) + sizeof ( char ))) == NULL ) { plexit( "opt_plwindow: Insufficient memory" ); } @@ -2276,7 +2276,7 @@ if (( plsc->geometry = (char *) malloc((size_t) ( 1 + strlen( optarg )) * - sizeof ( char ))) == NULL ) + sizeof ( char ))) == NULL ) { plexit( "opt_geo: Insufficient memory" ); } @@ -2335,7 +2335,7 @@ if (( plsc->tk_file = (char *) malloc((size_t) ( 1 + strlen( optarg )) * - sizeof ( char ))) == NULL ) + sizeof ( char ))) == NULL ) { plexit( "opt_tk_file: Insufficient memory" ); } Modified: trunk/src/plbox.c =================================================================== --- trunk/src/plbox.c 2009-09-23 22:33:33 UTC (rev 10466) +++ trunk/src/plbox.c 2009-09-23 23:34:11 UTC (rev 10467) @@ -38,36 +38,36 @@ static void plxybx( const char *opt, const char *label, PLINT axis, PLFLT wx1, PLFLT wy1, - PLFLT wx2, PLFLT wy2, PLFLT vmin, PLFLT vmax, - PLFLT tick, PLINT nsub, PLINT nolast, PLINT *digits ); + PLFLT wx2, PLFLT wy2, PLFLT vmin, PLFLT vmax, + PLFLT tick, PLINT nsub, PLINT nolast, PLINT *digits ); static void plzbx( const char *opt, const char *label, PLINT right, PLFLT dx, PLFLT dy, - PLFLT wx, PLFLT wy1, PLFLT wy2, PLFLT vmin, PLFLT vmax, - PLFLT tick, PLINT nsub, PLINT *digits ); + PLFLT wx, PLFLT wy1, PLFLT wy2, PLFLT vmin, PLFLT vmax, + PLFLT tick, PLINT nsub, PLINT *digits ); static void plxytx( PLFLT wx1, PLFLT wy1, PLFLT wx2, PLFLT wy2, - PLFLT disp, PLFLT pos, PLFLT just, const char *text ); + PLFLT disp, PLFLT pos, PLFLT just, const char *text ); static void plztx( const char *opt, PLFLT dx, PLFLT dy, PLFLT wx, PLFLT wy1, - PLFLT wy2, PLFLT disp, PLFLT pos, PLFLT just, const char *text ); + PLFLT wy2, PLFLT disp, PLFLT pos, PLFLT just, const char *text ); static void plform( PLINT axis, - PLFLT value, - PLINT scale, - PLINT prec, - char *result, - PLINT len, - PLBOOL ll, - PLBOOL lf, - PLBOOL lo ); + PLFLT value, + PLINT scale, + PLINT prec, + char *result, + PLINT len, + PLBOOL ll, + PLBOOL lf, + PLBOOL lo ); static void grid_box( const char *xopt, PLFLT xtick1, PLINT nxsub1, - const char *yopt, PLFLT ytick1, PLINT nysub1 ); + const char *yopt, PLFLT ytick1, PLINT nysub1 ); static void label_box( const char *xopt, PLFLT xtick1, const char *yopt, PLFLT ytick1 ); @@ -84,7 +84,7 @@ void c_plbox( const char *xopt, PLFLT xtick, PLINT nxsub, - const char *yopt, PLFLT ytick, PLINT nysub ) + const char *yopt, PLFLT ytick, PLINT nysub ) { c_plaxes( 0.0, 0.0, xopt, xtick, nxsub, yopt, ytick, nysub ); } @@ -124,8 +124,8 @@ void c_plaxes( PLFLT x0, PLFLT y0, - const char *xopt, PLFLT xtick, PLINT nxsub, - const char *yopt, PLFLT ytick, PLINT nysub ) + const char *xopt, PLFLT xtick, PLINT nxsub, + const char *yopt, PLFLT ytick, PLINT nysub ) { PLBOOL lax, lbx, lcx, ldx, lgx, lix, llx, lsx, ltx; PLBOOL lay, lby, lcy, ldy, lgy, liy, lly, lsy, lty; @@ -459,7 +459,7 @@ temp = tp + xlog[i]; if ( BETW( temp, vpwxmi, vpwxma )) plxtik( plP_wcpcx( - temp ), (PLINT) yp0, xminor, xminor ); + temp ), (PLINT) yp0, xminor, xminor ); } } else @@ -469,7 +469,7 @@ temp = tp + i * xtick1 / nxsub1; if ( BETW( temp, vpwxmi, vpwxma )) plxtik( plP_wcpcx( - temp ), (PLINT) yp0, xminor, xminor ); + temp ), (PLINT) yp0, xminor, xminor ); } } } @@ -502,7 +502,7 @@ temp = tp + xlog[i]; if ( BETW( temp, vpwymi, vpwyma )) plytik((PLINT) xp0, plP_wcpcy( - temp ), yminor, yminor ); + temp ), yminor, yminor ); } } else @@ -512,7 +512,7 @@ temp = tp + i * ytick1 / nysub1; if ( BETW( temp, vpwymi, vpwyma )) plytik((PLINT) xp0, plP_wcpcy( - temp ), yminor, yminor ); + temp ), yminor, yminor ); } } } @@ -545,8 +545,8 @@ void c_plbox3( const char *xopt, const char *xlabel, PLFLT xtick, PLINT nsubx, - const char *yopt, const char *ylabel, PLFLT ytick, PLINT nsuby, - const char *zopt, const char *zlabel, PLFLT ztick, PLINT nsubz ) + const char *yopt, const char *ylabel, PLFLT ytick, PLINT nsuby, + const char *zopt, const char *zlabel, PLFLT ztick, PLINT nsubz ) { PLFLT dx, dy, tx, ty, ux, uy; PLFLT xmin, xmax, ymin, ymax, zmin, zmax, zscale; @@ -596,30 +596,30 @@ ux = plP_w3wcx( xmax, ymin, zmin ); uy = plP_w3wcy( xmax, ymin, zmin ); plxybx( xopt, xlabel, PL_X_AXIS, tx, ty, ux, uy, - xmin, xmax, xtick, nsubx, 0, &xdigits ); + xmin, xmax, xtick, nsubx, 0, &xdigits ); dx = ux - tx; dy = uy - ty; plzbx( zopt, zlabel, 1, dx, dy, ux, uy, - plP_w3wcy( xmax, - ymin, - zmax ), zmin, zmax, ztick, nsubz, &zdigits ); + plP_w3wcy( xmax, + ymin, + zmax ), zmin, zmax, ztick, nsubz, &zdigits ); tx = plP_w3wcx( xmin, ymax, zmin ); ty = plP_w3wcy( xmin, ymax, zmin ); ux = plP_w3wcx( xmin, ymin, zmin ); uy = plP_w3wcy( xmin, ymin, zmin ); plxybx( yopt, ylabel, PL_Y_AXIS, tx, ty, ux, uy, - ymax, ymin, ytick, nsuby, ln, &ydigits ); + ymax, ymin, ytick, nsuby, ln, &ydigits ); dx = ux - tx; dy = uy - ty; /* restore zdigits to initial value for second call */ zdigits = zdigmax; plzbx( zopt, zlabel, 0, dx, dy, tx, ty, - plP_w3wcy( xmin, - ymax, - zmax ), zmin, zmax, ztick, nsubz, &zdigits ); + plP_w3wcy( xmin, + ymax, + zmax ), zmin, zmax, ztick, nsubz, &zdigits ); } else if ( cxx <= 0.0 && cxy <= 0.0 ) { @@ -629,30 +629,30 @@ ux = plP_w3wcx( xmin, ymin, zmin ); uy = plP_w3wcy( xmin, ymin, zmin ); plxybx( yopt, ylabel, PL_Y_AXIS, tx, ty, ux, uy, - ymax, ymin, ytick, nsuby, 0, &ydigits ); + ymax, ymin, ytick, nsuby, 0, &ydigits ); dx = ux - tx; dy = uy - ty; plzbx( zopt, zlabel, 1, dx, dy, ux, uy, - plP_w3wcy( xmin, - ymin, - zmax ), zmin, zmax, ztick, nsubz, &zdigits ); + plP_w3wcy( xmin, + ymin, + zmax ), zmin, zmax, ztick, nsubz, &zdigits ); tx = plP_w3wcx( xmax, ymax, zmin ); ty = plP_w3wcy( xmax, ymax, zmin ); ux = plP_w3wcx( xmin, ymax, zmin ); uy = plP_w3wcy( xmin, ymax, zmin ); plxybx( xopt, xlabel, PL_X_AXIS, tx, ty, ux, uy, - xmax, xmin, xtick, nsubx, ln, &xdigits ); + xmax, xmin, xtick, nsubx, ln, &xdigits ); dx = ux - tx; dy = uy - ty; /* restore zdigits to initial value for second call */ zdigits = zdigmax; plzbx( zopt, zlabel, 0, dx, dy, tx, ty, - plP_w3wcy( xmax, - ymax, - zmax ), zmin, zmax, ztick, nsubz, &zdigits ); + plP_w3wcy( xmax, + ymax, + zmax ), zmin, zmax, ztick, nsubz, &zdigits ); } else if ( cxx <= 0.0 && cxy >= 0.0 ) { @@ -662,30 +662,30 @@ ux = plP_w3wcx( xmin, ymax, zmin ); uy = plP_w3wcy( xmin, ymax, zmin ); plxybx( xopt, xlabel, PL_X_AXIS, tx, ty, ux, uy, - xmax, xmin, xtick, nsubx, 0, &xdigits ); + xmax, xmin, xtick, nsubx, 0, &xdigits ); dx = ux - tx; dy = uy - ty; plzbx( zopt, zlabel, 1, dx, dy, ux, uy, - plP_w3wcy( xmin, - ymax, - zmax ), zmin, zmax, ztick, nsubz, &zdigits ); + plP_w3wcy( xmin, + ymax, + zmax ), zmin, zmax, ztick, nsubz, &zdigits ); tx = plP_w3wcx( xmax, ymin, zmin ); ty = plP_w3wcy( xmax, ymin, zmin ); ux = plP_w3wcx( xmax, ymax, zmin ); uy = plP_w3wcy( xmax, ymax, zmin ); plxybx( yopt, ylabel, PL_Y_AXIS, tx, ty, ux, uy, - ymin, ymax, ytick, nsuby, ln, &ydigits ); + ymin, ymax, ytick, nsuby, ln, &ydigits ); dx = ux - tx; dy = uy - ty; /* restore zdigits to initial value for second call */ zdigits = zdigmax; plzbx( zopt, zlabel, 0, dx, dy, tx, ty, - plP_w3wcy( xmax, - ymin, - zmax ), zmin, zmax, ztick, nsubz, &zdigits ); + plP_w3wcy( xmax, + ymin, + zmax ), zmin, zmax, ztick, nsubz, &zdigits ); } else if ( cxx >= 0.0 && cxy >= 0.0 ) { @@ -695,30 +695,30 @@ ux = plP_w3wcx( xmax, ymax, zmin ); uy = plP_w3wcy( xmax, ymax, zmin ); plxybx( yopt, ylabel, PL_X_AXIS, tx, ty, ux, uy, - ymin, ymax, ytick, nsuby, 0, &ydigits ); + ymin, ymax, ytick, nsuby, 0, &ydigits ); dx = ux - tx; dy = uy - ty; plzbx( zopt, zlabel, 1, dx, dy, ux, uy, - plP_w3wcy( xmax, - ymax, - zmax ), zmin, zmax, ztick, nsubz, &zdigits ); + plP_w3wcy( xmax, + ymax, + zmax ), zmin, zmax, ztick, nsubz, &zdigits ); tx = plP_w3wcx( xmin, ymin, zmin ); ty = plP_w3wcy( xmin, ymin, zmin ); ux = plP_w3wcx( xmax, ymin, zmin ); uy = plP_w3wcy( xmax, ymin, zmin ); plxybx( xopt, xlabel, PL_X_AXIS, tx, ty, ux, uy, - xmin, xmax, xtick, nsubx, ln, &xdigits ); + xmin, xmax, xtick, nsubx, ln, &xdigits ); dx = ux - tx; dy = uy - ty; /* restore zdigits to initial value for second call */ zdigits = zdigmax; plzbx( zopt, zlabel, 0, dx, dy, tx, ty, - plP_w3wcy( xmin, - ymin, - zmax ), zmin, zmax, ztick, nsubz, &zdigits ); + plP_w3wcy( xmin, + ymin, + zmax ), zmin, zmax, ztick, nsubz, &zdigits ); } plsxax( xdigmax, xdigits ); plsyax( ydigmax, ydigits ); @@ -751,8 +751,8 @@ static void plxybx( const char *opt, const char *label, PLINT axis, PLFLT wx1, PLFLT wy1, - PLFLT wx2, PLFLT wy2, PLFLT vmin_in, PLFLT vmax_in, - PLFLT tick, PLINT nsub, PLINT nolast, PLINT *digits ) + PLFLT wx2, PLFLT wy2, PLFLT vmin_in, PLFLT vmax_in, + PLFLT tick, PLINT nsub, PLINT nolast, PLINT *digits ) { static char string[STRING_LEN]; PLINT lb, ld, lf, li, ll, ln, ls, lt, lu, lo; @@ -837,8 +837,8 @@ ( temp - vmin ) / ( vmax - vmin ) : ( vmax - temp ) / ( vmax - vmin ); plxtik( plP_wcpcx((PLFLT) ( wx1 + lambda * dwx )), - plP_wcpcy((PLFLT) ( wy1 + lambda * dwy )), - i1, i2 ); + plP_wcpcy((PLFLT) ( wy1 + lambda * dwy )), + i1, i2 ); } } } @@ -853,8 +853,8 @@ ( temp - vmin ) / ( vmax - vmin ) : ( vmax - temp ) / ( vmax - vmin ); plxtik( plP_wcpcx((PLFLT) ( wx1 + lambda * dwx )), - plP_wcpcy((PLFLT) ( wy1 + lambda * dwy )), - i1, i2 ); + plP_wcpcy((PLFLT) ( wy1 + lambda * dwy )), + i1, i2 ); } } } @@ -867,7 +867,7 @@ ( temp - vmin ) / ( vmax - vmin ) : ( vmax - temp ) / ( vmax - vmin ); plxtik( plP_wcpcx((PLFLT) ( wx1 + lambda * dwx )), - plP_wcpcy((PLFLT) ( wy1 + lambda * dwy )), i3, i4 ); + plP_wcpcy((PLFLT) ( wy1 + lambda * dwy )), i3, i4 ); tp = tn; } } @@ -911,7 +911,7 @@ static void plxytx( PLFLT wx1, PLFLT wy1, PLFLT wx2, PLFLT wy2, - PLFLT disp, PLFLT pos, PLFLT just, const char *text ) + PLFLT disp, PLFLT pos, PLFLT just, const char *text ) { PLINT x, y, refx, refy; PLFLT shift, cc, ss, wx, wy; @@ -979,8 +979,8 @@ static void plzbx( const char *opt, const char *label, PLINT right, PLFLT dx, PLFLT dy, - PLFLT wx, PLFLT wy1, PLFLT wy2, PLFLT vmin_in, PLFLT vmax_in, - PLFLT tick, PLINT nsub, PLINT *digits ) + PLFLT wx, PLFLT wy1, PLFLT wy2, PLFLT vmin_in, PLFLT vmax_in, + PLFLT tick, PLINT nsub, PLINT *digits ) { static char string[STRING_LEN]; PLINT lb, lc, ld, lf, li, ll, lm, ln, ls, lt, lu, lv, lo; @@ -1073,8 +1073,8 @@ ( temp - vmin ) / ( vmax - vmin ) : ( vmax - temp ) / ( vmax - vmin ); plstik( plP_wcmmx( wx ), - plP_wcmmy((PLFLT) ( wy1 + lambda * dwy )), - xminor, yminor ); + plP_wcmmy((PLFLT) ( wy1 + lambda * dwy )), + xminor, yminor ); } } } @@ -1089,8 +1089,8 @@ ( temp - vmin ) / ( vmax - vmin ) : ( vmax - temp ) / ( vmax - vmin ); plstik( plP_wcmmx( wx ), - plP_wcmmy((PLFLT) ( wy1 + lambda * dwy )), - xminor, yminor ); + plP_wcmmy((PLFLT) ( wy1 + lambda * dwy )), + xminor, yminor ); } } } @@ -1102,7 +1102,7 @@ ( temp - vmin ) / ( vmax - vmin ) : ( vmax - temp ) / ( vmax - vmin ); plstik( plP_wcmmx( wx ), plP_wcmmy((PLFLT) ( wy1 + lambda * dwy )), - xmajor, ymajor ); + xmajor, ymajor ); tp = tn; } } @@ -1142,7 +1142,7 @@ if ( lm && right ) { plztx( "v", dx, dy, wx, wy1, wy2, - (PLFLT) -height, pos, 0.5, string ); + (PLFLT) -height, pos, 0.5, string ); } } } @@ -1157,7 +1157,7 @@ static void plztx( const char *opt, PLFLT dx, PLFLT dy, PLFLT wx, PLFLT wy1, - PLFLT wy2, PLFLT disp, PLFLT pos, PLFLT just, const char *text ) + PLFLT wy2, PLFLT disp, PLFLT pos, PLFLT just, const char *text ) { PLINT refx = 0, refy = 0, x = 0, y = 0, vert = 0; PLFLT shift, cc, ss, wy; @@ -1226,7 +1226,7 @@ static void grid_box( const char *xopt, PLFLT xtick1, PLINT nxsub1, - const char *yopt, PLFLT ytick1, PLINT nysub1 ) + const char *yopt, PLFLT ytick1, PLINT nysub1 ) { PLINT lgx, lhx, llx; PLINT lgy, lhy, lly; @@ -1400,22 +1400,22 @@ if ( ldx ) { strfqsas( string, - STRING_LEN, - timefmt, - (double) tn, - plsc->qsasconfig ); + STRING_LEN, + timefmt, + (double) tn, + plsc->qsasconfig ); } else { plform( PL_X_AXIS, - tn, - xscale, - xprec, - string, - STRING_LEN, - llx, - lfx, - lox ); + tn, + xscale, + xprec, + string, + STRING_LEN, + llx, + lfx, + lox ); } height = lix ? 1.75 : 1.5; pos = ( vpwxmax > vpwxmin ) ? @@ -1479,22 +1479,22 @@ if ( ldy ) { strfqsas( string, - STRING_LEN, - timefmt, - (double) tn, - plsc->qsasconfig ); + STRING_LEN, + timefmt, + (double) tn, + plsc->qsasconfig ); } else { plform( PL_Y_AXIS, - tn, - yscale, - yprec, - string, - STRING_LEN, - lly, - lfy, - loy ); + tn, + yscale, + yprec, + string, + STRING_LEN, + lly, + lfy, + loy ); } pos = ( vpwymax > vpwymin ) ? ( tn - vpwymi ) / ( vpwyma - vpwymi ) : @@ -1593,14 +1593,14 @@ static void plform( PLINT axis, - PLFLT value, - PLINT scale, - PLINT prec, - char *string, - PLINT len, - PLBOOL ll, - PLBOOL lf, - PLBOOL lo ) + PLFLT value, + PLINT scale, + PLINT prec, + char *string, + PLINT len, + PLBOOL ll, + PLBOOL lf, + PLBOOL lo ) { /* Check to see if a custom labeling function is defined. If not, */ if ( lo && plsc->label_func ) @@ -1697,10 +1697,10 @@ \*--------------------------------------------------------------------------*/ void c_plslabelfunc( void ( *label_func )( PLINT, - PLFLT, - char *, - PLINT, - PLPointer ), PLPointer label_data ) + PLFLT, + char *, + PLINT, + PLPointer ), PLPointer label_data ) { plsc->label_func = label_func; plsc->label_data = label_data; Modified: trunk/src/plbuf.c =================================================================== --- trunk/src/plbuf.c 2009-09-23 22:33:33 UTC (rev 10466) +++ trunk/src/plbuf.c 2009-09-23 23:34:11 UTC (rev 10467) @@ -268,9 +268,9 @@ wr_data( pls, pls->dev_ix, sizeof ( short ) * npts ); wr_data( pls, pls->dev_iy, sizeof ( short ) * npts ); wr_data( pls, - pls->dev_z, - sizeof ( unsigned short ) * - ( pls->dev_nptsX - 1 ) * ( pls->dev_nptsY - 1 )); + pls->dev_z, + sizeof ( unsigned short ) * + ( pls->dev_nptsX - 1 ) * ( pls->dev_nptsY - 1 )); } /*--------------------------------------------------------------------------*\ @@ -311,8 +311,8 @@ wr_data( pls, &text->unicode_array_len, sizeof ( PLINT )); if ( text->unicode_array_len ) wr_data( pls, - text->unicode_array, - sizeof ( PLUNICODE ) * text->unicode_array_len ); + text->unicode_array, + sizeof ( PLUNICODE ) * text->unicode_array_len ); } /*--------------------------------------------------------------------------*\ @@ -579,9 +579,9 @@ { char buffer[256]; snprintf( buffer, - 256, - "rdbuf_state: Invalid color map entry: %d", - (int) icol0 ); + 256, + "rdbuf_state: Invalid color map entry: %d", + (int) icol0 ); plabort( buffer ); return; } @@ -758,15 +758,15 @@ (( dev_z = (unsigned short *) malloc(( nptsX - 1 ) * - ( nptsY - - 1 ) * sizeof ( unsigned short ))) == + ( nptsY - + 1 ) * sizeof ( unsigned short ))) == NULL )) plexit( "rdbuf_image: Insufficient memory" ); rd_data( pls, dev_ix, sizeof ( short ) * npts ); rd_data( pls, dev_iy, sizeof ( short ) * npts ); rd_data( pls, dev_z, sizeof ( unsigned short ) * - ( nptsX - 1 ) * ( nptsY - 1 )); + ( nptsX - 1 ) * ( nptsY - 1 )); /* * COMMENTED OUT by Hezekiah Carty @@ -847,7 +847,7 @@ { if (( unicode = (PLUNICODE *) malloc( text.unicode_array_len * - sizeof ( PLUNICODE ))) + sizeof ( PLUNICODE ))) == NULL ) plexit( "rdbuf_text: Insufficient memory" ); @@ -1011,9 +1011,9 @@ default: pldebug( "plbuf_control", - "Unrecognized command %d, previous %d\n", - c, - c_old ); + "Unrecognized command %d, previous %d\n", + c, + c_old ); } c_old = c; } @@ -1087,7 +1087,7 @@ if ( pls->verbose ) printf( "Growing buffer to %d KB\n", - (int) ( pls->plbuf_buffer_size / 1024 )); + (int) ( pls->plbuf_buffer_size / 1024 )); if (( pls->plbuf_buffer = realloc( pls->plbuf_buffer, pls->plbuf_buffer_size )) == NULL ) plexit( "plbuf wr_data: Plot buffer grow failed" ); @@ -1208,7 +1208,7 @@ /* Yes, reallocate a larger one */ if (( plot_state = (struct _state *) realloc( state, - save_size )) == NULL ) + save_size )) == NULL ) { /* NOTE: If realloc fails, then plot_state ill be NULL. * This will leave the original buffer untouched, thus we @@ -1276,7 +1276,7 @@ while ( count = fread( &tmp, sizeof ( U_CHAR ), 1, pls->plbufFile )) { if ( fwrite( &tmp, sizeof ( U_CHAR ), 1, - plot_state->plbufFile ) != count ) + plot_state->plbufFile ) != count ) { /* Throw a warning since this might be a permissions problem * and we may not want to force an exit @@ -1302,7 +1302,7 @@ * are copying the portion of the plot buffer that is being used */ if ( memcpy( plot_state->plbuf_buffer, pls->plbuf_buffer, - pls->plbuf_top ) == NULL ) + pls->plbuf_top ) == NULL ) { /* This should never be NULL */ plwarn( "plbuf: Got a NULL in memcpy!" ); Modified: trunk/src/plcont.c =================================================================== --- trunk/src/plcont.c 2009-09-23 22:33:33 UTC (rev 10466) +++ trunk/src/plcont.c 2009-09-23 23:34:11 UTC (rev 10467) @@ -34,21 +34,21 @@ static void plcntr( PLFLT ( *plf2eval )( PLINT, PLINT, PLPointer ), - PLPointer plf2eval_data, - PLINT nx, PLINT ny, PLINT kx, PLINT lx, - PLINT ky, PLINT ly, PLFLT flev, PLINT **ipts, - void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), - PLPointer pltr_data ); + PLPointer plf2eval_data, + PLINT nx, PLINT ny, PLINT kx, PLINT lx, + PLINT ky, PLINT ly, PLFLT flev, PLINT **ipts, + void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), + PLPointer pltr_data ); static void pldrawcn( PLFLT ( *plf2eval )( PLINT, PLINT, PLPointer ), - PLPointer plf2eval_data, - PLINT nx, PLINT ny, PLINT kx, PLINT lx, - PLINT ky, PLINT ly, PLFLT flev, char *flabel, PLINT kcol, PLINT krow, - PLFLT lastx, PLFLT lasty, PLINT startedge, - PLINT **ipts, PLFLT *distance, PLINT *lastindex, - void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), - PLPointer pltr_data ); + PLPointer plf2eval_data, + PLINT nx, PLINT ny, PLINT kx, PLINT lx, + PLINT ky, PLINT ly, PLFLT flev, char *flabel, PLINT kcol, PLINT krow, + PLFLT lastx, PLFLT lasty, PLINT startedge, + PLINT **ipts, PLFLT *distance, PLINT *lastindex, + void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), + PLPointer pltr_data ); static void plfloatlabel( PLFLT value, char *string, PLINT len ); @@ -61,10 +61,10 @@ static void pl_drawcontlabel( PLFLT tpx, - PLFLT tpy, - char *flabel, - PLFLT *distance, - PLINT *lastindex ); + PLFLT tpy, + char *flabel, + PLFLT *distance, + PLINT *lastindex ); /* Error flag for aborts */ @@ -152,12 +152,12 @@ realloc_line( CONT_LINE *line ) { if ((( line->x = (PLFLT *) realloc( line->x, - ( line->npts + - LINE_ITEMS ) * sizeof ( PLFLT ))) == + ( line->npts + + LINE_ITEMS ) * sizeof ( PLFLT ))) == NULL ) || (( line->y = (PLFLT *) realloc( line->y, - ( line->npts + - LINE_ITEMS ) * sizeof ( PLFLT ))) == + ( line->npts + + LINE_ITEMS ) * sizeof ( PLFLT ))) == NULL )) plexit( "realloc_line: Insufficient memory" ); } @@ -259,9 +259,9 @@ /* small routine to set offset and spacing of contour labels, see desciption above */ void c_pl_setcontlabelparam( PLFLT offset, - PLFLT size, - PLFLT spacing, - PLINT active ) + PLFLT size, + PLFLT spacing, + PLINT active ) { contlabel_offset = offset; contlabel_size = size; @@ -277,10 +277,10 @@ } static void pl_drawcontlabel( PLFLT tpx, - PLFLT tpy, - char *flabel, - PLFLT *distance, - PLINT *lastindex ) + PLFLT tpy, + char *flabel, + PLFLT *distance, + PLINT *lastindex ) { PLFLT delta_x, delta_y; PLINT currx_old, curry_old; @@ -316,7 +316,7 @@ dev_y = mx * vec_x / my; scale = sqrt(( mx * mx * dev_x * dev_x + my * my * dev_y * dev_y ) / - ( contlabel_offset * contlabel_offset )); + ( contlabel_offset * contlabel_offset )); off_x = dev_x / scale; off_y = dev_y / scale; @@ -493,15 +493,15 @@ void cont_store( PLFLT **f, PLINT nx, PLINT ny, PLINT kx, PLINT lx, - PLINT ky, PLINT ly, PLFLT *clevel, PLINT nlevel, - void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), - PLPointer pltr_data, - CONT_LEVEL **contour ) + PLINT ky, PLINT ly, PLFLT *clevel, PLINT nlevel, + void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), + PLPointer pltr_data, + CONT_LEVEL **contour ) { cont3d = 1; plcont( f, nx, ny, kx, lx, ky, ly, clevel, nlevel, - pltr, pltr_data ); + pltr, pltr_data ); *contour = startlev; cont3d = 0; @@ -516,9 +516,9 @@ void c_plcont( PLFLT **f, PLINT nx, PLINT ny, PLINT kx, PLINT lx, - PLINT ky, PLINT ly, PLFLT *clevel, PLINT nlevel, - void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), - PLPointer pltr_data ) + PLINT ky, PLINT ly, PLFLT *clevel, PLINT nlevel, + void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), + PLPointer pltr_data ) { PLfGrid2 grid; @@ -531,8 +531,8 @@ grid.f = f; plfcont( plf2eval2, ( PLPointer ) & grid, - nx, ny, kx, lx, ky, ly, clevel, nlevel, - pltr, pltr_data ); + nx, ny, kx, lx, ky, ly, clevel, nlevel, + pltr, pltr_data ); } /*--------------------------------------------------------------------------*\ @@ -554,11 +554,11 @@ void plfcont( PLFLT ( *f2eval )( PLINT, PLINT, PLPointer ), - PLPointer f2eval_data, - PLINT nx, PLINT ny, PLINT kx, PLINT lx, - PLINT ky, PLINT ly, PLFLT *clevel, PLINT nlevel, - void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), - PLPointer pltr_data ) + PLPointer f2eval_data, + PLINT nx, PLINT ny, PLINT kx, PLINT lx, + PLINT ky, PLINT ly, PLFLT *clevel, PLINT nlevel, + void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), + PLPointer pltr_data ) { PLINT i, **ipts; @@ -589,8 +589,8 @@ for ( i = 0; i < nlevel; i++ ) { plcntr( f2eval, f2eval_data, - nx, ny, kx - 1, lx - 1, ky - 1, ly - 1, clevel[i], ipts, - pltr, pltr_data ); + nx, ny, kx - 1, lx - 1, ky - 1, ly - 1, clevel[i], ipts, + pltr, pltr_data ); if ( error ) { @@ -616,11 +616,11 @@ static void plcntr( PLFLT ( *f2eval )( PLINT, PLINT, PLPointer ), - PLPointer f2eval_data, - PLINT nx, PLINT ny, PLINT kx, PLINT lx, - PLINT ky, PLINT ly, PLFLT flev, PLINT **ipts, - void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), - PLPointer pltr_data ) + PLPointer f2eval_data, + PLINT nx, PLINT ny, PLINT kx, PLINT lx, + PLINT ky, PLINT ly, PLFLT flev, PLINT **ipts, + void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), + PLPointer pltr_data ) { PLINT kcol, krow, lastindex; PLFLT distance; @@ -654,9 +654,9 @@ { /* Follow and draw a contour */ pldrawcn( f2eval, f2eval_data, - nx, ny, kx, lx, ky, ly, flev, flabel, kcol, krow, - 0.0, 0.0, -2, ipts, &distance, &lastindex, - pltr, pltr_data ); + nx, ny, kx, lx, ky, ly, flev, flabel, kcol, krow, + 0.0, 0.0, -2, ipts, &distance, &lastindex, + pltr, pltr_data ); if ( error ) return; @@ -674,13 +674,13 @@ static void pldrawcn( PLFLT ( *f2eval )( PLINT, PLINT, PLPointer ), - PLPointer f2eval_data, - PLINT nx, PLINT ny, PLINT kx, PLINT lx, - PLINT ky, PLINT ly, PLFLT flev, char *flabel, PLINT kcol, PLINT krow, - PLFLT lastx, PLFLT lasty, PLINT startedge, PLINT **ipts, - PLFLT *distance, PLINT *lastindex, - void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), - PLPointer pltr_data ) + PLPointer f2eval_data, + PLINT nx, PLINT ny, PLINT kx, PLINT lx, + PLINT ky, PLINT ly, PLFLT flev, char *flabel, PLINT kcol, PLINT krow, + PLFLT lastx, PLFLT lasty, PLINT startedge, PLINT **ipts, + PLFLT *distance, PLINT *lastindex, + void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ), + PLPointer pltr_data ) { PLFLT f[4]; PLFLT px[4], py[4], locx[4], locy[4]; @@ -777,10 +777,10 @@ /* Link to the next point on the contour */ if ( contlabel_active ) pl_drawcontlabel( locx[num], - locy[num], - flabel, - distance, - lastindex ); + locy[num], + flabel, + distance, + lastindex ); else cont_xy_store( locx[num], locy[num] ); /* Need to follow contour into next grid box */ @@ -799,11 +799,11 @@ ( ipts[kcolnext][krownext] == 0 )) { pldrawcn( f2eval, f2eval_data, - nx, ny, kx, lx, ky, ly, flev, flabel, - kcolnext, krownext, - locx[num], locy[num], inext, ipts, - distance, lastindex, - pltr, pltr_data ); + nx, ny, kx, lx, ky, ly, flev, flabel, + kcolnext, krownext, + locx[num], locy[num], inext, ipts, + distance, lastindex, + pltr, pltr_data ); } } /* Hard case where contour passes through corner */ @@ -836,11 +836,11 @@ ( ipts[kcolnext][krownext] == 0 )) { pldrawcn( f2eval, f2eval_data, - nx, ny, kx, lx, ky, ly, flev, flabel, - kcolnext, krownext, - locx[num], locy[num], inext, ipts, - distance, lastindex, - pltr, pltr_data ); + nx, ny, kx, lx, ky, ly, flev, flabel, + kcolnext, krownext, + locx[num], locy[num], inext, ipts, + distance, lastindex, + pltr, pltr_data ); } } if ( first == 1 ) Modified: trunk/src/plcore.c =================================================================== --- trunk/src/plcore.c 2009-09-23 22:33:33 UTC (rev 10466) +++ trunk/src/plcore.c 2009-09-23 23:34:11 UTC (rev 10467) @@ -265,12 +265,12 @@ { args = (EscText*) ptr; difilt( &( args->x ), - &( args->y ), - 1, - &clpxmi, - &clpxma, - &clpymi, - &clpyma ); + &( args->y ), + 1, + &clpxmi, + &clpxma, + &clpymi, + &clpyma ); } } @@ -328,7 +328,7 @@ { char *save_locale = plsave_set_locale(); ( *plsc->dispatch_table->pl_esc )((struct PLStream_struct *) plsc, - PLESC_SWIN, NULL ); + PLESC_SWIN, NULL ); plrestore_locale( save_locale ); } } @@ -388,7 +388,7 @@ } difilt( xscl, yscl, npts, &clpxmi, &clpxma, &clpymi, &clpyma ); plP_pllclp( xscl, yscl, npts, clpxmi, clpxma, clpymi, clpyma, - grpolyline ); + grpolyline ); } else { @@ -455,7 +455,7 @@ } difilt( xscl, yscl, npts, &clpxmi, &clpxma, &clpymi, &clpyma ); plP_plfclp( xscl, yscl, npts, clpxmi, clpxma, clpymi, clpyma, - grfill ); + grfill ); } else { @@ -492,9 +492,9 @@ if ( end != endptr[0] ) { snprintf( msgbuf, - BUFFER_SIZE, - "text2num: invalid control string detected - %c expected", - end ); + BUFFER_SIZE, + "text2num: invalid control string detected - %c expected", + end ); plwarn( msgbuf ); } @@ -520,8 +520,8 @@ \*--------------------------------------------------------------------------*/ int text2fci( const char *text, - unsigned char *hexdigit, - unsigned char *hexpower ) + unsigned char *hexdigit, + unsigned char *hexpower ) { typedef struct { @@ -566,7 +566,7 @@ void plP_text( PLINT base, PLFLT just, PLFLT *xform, PLINT x, PLINT y, - PLINT refx, PLINT refy, const char *string ) + PLINT refx, PLINT refy, const char *string ) { if ( plsc->dev_text ) /* Does the device render it's own text ? */ { @@ -746,8 +746,8 @@ else { i += text2fci( &string[i + 1], - &hexdigit, - &hexpower ); + &hexdigit, + &hexpower ); if ( hexpower < 7 ) { plP_hex2fci( hexdigit, hexpower, &fci ); @@ -910,7 +910,7 @@ PLUNICODE unichar = 0; #ifdef HAVE_LIBUNICODE char * ptr = unicode_get_utf8( string + i, - &unichar ); + &unichar ); #else char* ptr = utf8_to_ucs4( string + i, &unichar ); #endif @@ -920,10 +920,10 @@ strncpy( buf, string, 30 ); buf[30] = '\0'; snprintf( buf, - BUFFER_SIZE, - "UTF-8 string is malformed: %s%s", - buf, - strlen( string ) > 30 ? "[...]" : "" ); + BUFFER_SIZE, + "UTF-8 string is malformed: %s%s", + buf, + strlen( string ) > 30 ? "[...]" : "" ); plabort( buf ); return; } @@ -1120,7 +1120,7 @@ { char *save_locale = plsave_set_locale(); ( *plsc->dispatch_table->pl_line )((struct PLStream_struct *) plsc, - x[0], y[0], x[1], y[1] ); + x[0], y[0], x[1], y[1] ); plrestore_locale( save_locale ); } @@ -1129,7 +1129,7 @@ { char *save_locale = plsave_set_locale(); ( *plsc->dispatch_table->pl_polyline )((struct PLStream_struct *) plsc, - x, y, npts ); + x, y, npts ); plrestore_locale( save_locale ); } @@ -1143,7 +1143,7 @@ save_locale = plsave_set_locale(); ( *plsc->dispatch_table->pl_esc )((struct PLStream_struct *) plsc, - PLESC_FILL, NULL ); + PLESC_FILL, NULL ); plrestore_locale( save_locale ); } @@ -1169,7 +1169,7 @@ void difilt( PLINT *xscl, PLINT *yscl, PLINT npts, - PLINT *clpxmi, PLINT *clpxma, PLINT *clpymi, PLINT *clpyma ) + PLINT *clpxmi, PLINT *clpxma, PLINT *clpymi, PLINT *clpyma ) { PLINT i, x, y; @@ -1238,7 +1238,7 @@ void sdifilt( short *xscl, short *yscl, PLINT npts, - PLINT *clpxmi, PLINT *clpxma, PLINT *clpymi, PLINT *clpyma ) + PLINT *clpxmi, PLINT *clpxma, PLINT *clpymi, PLINT *clpyma ) { int i; short x, y; @@ -1409,8 +1409,8 @@ if ( plsc->difilt & PLDI_DEV ) { pldebug( "pldid2pc", - "Relative device coordinates (in): %f, %f, %f, %f\n", - *xmin, *ymin, *xmax, *ymax ); + "Relative device coordinates (in): %f, %f, %f, %f\n", + *xmin, *ymin, *xmax, *ymax ); pxmin = plP_dcpcx( *xmin ); pymin = plP_dcpcy( *ymin ); @@ -1433,8 +1433,8 @@ *ymax = ( rymax > 1 ) ? 1 : rymax; pldebug( "pldid2pc", - "Relative plot coordinates (out): %f, %f, %f, %f\n", - rxmin, rymin, rxmax, rymax ); + "Relative plot coordinates (out): %f, %f, %f, %f\n", + rxmin, rymin, rxmax, rymax ); } } @@ -1455,8 +1455,8 @@ if ( plsc->difilt & PLDI_DEV ) { pldebug( "pldip2pc", - "Relative plot coordinates (in): %f, %f, %f, %f\n", - *xmin, *ymin, *xmax, *ymax ); + "Relative plot coordinates (in): %f, %f, %f, %f\n", + *xmin, *ymin, *xmax, *ymax ); pxmin = plP_dcpcx( *xmin ); pymin = plP_dcpcy( *ymin ); @@ -1479,8 +1479,8 @@ *ymax = ( rymax > 1 ) ? 1 : rymax; pldebug( "pldip2pc", - "Relative device coordinates (out): %f, %f, %f, %f\n", - rxmin, rymin, rxmax, rymax ); + "Relative device coordinates (out): %f, %f, %f, %f\n", + rxmin, rymin, rxmax, rymax ); } } @@ -1548,7 +1548,7 @@ { char *save_locale = plsave_set_locale(); ( *plsc->dispatch_table->pl_esc )((struct PLStream_struct *) plsc, - PLESC_DI, NULL ); + PLESC_DI, NULL ); plrestore_locale( save_locale ); } @@ -1634,7 +1634,7 @@ { char *save_locale = plsave_set_locale(); ( *plsc->dispatch_table->pl_esc )((struct PLStream_struct *) plsc, - PLESC_DI, NULL ); + PLESC_DI, NULL ); plrestore_locale( save_locale ); } @@ -1756,7 +1756,7 @@ { char *save_locale = plsave_set_locale(); ( *plsc->dispatch_table->pl_esc )((struct PLStream_struct *) plsc, - PLESC_DI, NULL ); + PLESC_DI, NULL ); plrestore_locale( save_locale ); } @@ -1835,7 +1835,7 @@ void c_plsdimap( PLINT dimxmin, PLINT dimxmax, PLINT dimymin, PLINT dimymax, - PLFLT dimxpmm, PLFLT dimypmm ) + PLFLT dimxpmm, PLFLT dimypmm ) { plsetvar( plsc->dimxmin, dimxmin ); plsetvar( plsc->dimxmax, dimxmax ); @@ -1912,7 +1912,7 @@ { char *save_locale = plsave_set_locale(); ( *plsc->dispatch_table->pl_esc )((struct PLStream_struct *) plsc, - PLESC_FLUSH, NULL ); + PLESC_FLUSH, NULL ); plrestore_locale( save_locale ); } else @@ -2265,8 +2265,8 @@ if ( strm < 0 || strm >= PL_NSTREAMS ) { fprintf( stderr, - "plsstrm: Illegal stream number %d, must be in [0, %d]\n", - (int) strm, PL_NSTREAMS ); + "plsstrm: Illegal stream number %d, must be in [0, %d]\n", + (int) strm, PL_NSTREAMS ); } else { @@ -2444,10 +2444,10 @@ if ( !( flags & 0x01 )) { pldebug( "plcpstrm", "mapping parameters: %d %d %d %d %f %f\n", - plsr->phyxmi, plsr->phyxma, plsr->phyymi, plsr->phyyma, - plsr->xpmm, plsr->ypmm ); + plsr->phyxmi, plsr->phyxma, plsr->phyymi, plsr->phyyma, + plsr->xpmm, plsr->ypmm ); plsdimap( plsr->phyxmi, plsr->phyxma, plsr->phyymi, plsr->phyyma, - plsr->xpmm, plsr->ypmm ); + plsr->xpmm, plsr->ypmm ); } /* current color */ @@ -2561,7 +2561,7 @@ } if ( chdir( currdir ) != 0 ) pldebug( "plInBuildTree():", - "Unable to chdir to current directory" ); + "Unable to chdir to current directory" ); } } inited = 1; @@ -2593,7 +2593,7 @@ if ( drvdir == NULL ) { pldebug( "plGetDrvDir", - "Will use drivers dir: " DRV_DIR "\n" ); + "Will use drivers dir: " DRV_DIR "\n" ); drvdir = DRV_DIR; } } @@ -2663,7 +2663,7 @@ int len = strlen( name ) - 3; pldebug( "plInitDispatchTable", - "Consider file %s\n", name ); + "Consider file %s\n", name ); /* Only consider entries that have the ".rc" suffix */ if (( len > 0 ) && ( strcmp( name + len, ".rc" ) == 0 )) @@ -2690,7 +2690,7 @@ * character */ pldebug( "plInitDispatchTable", - "Opened driver info file %s\n", name ); + "Opened driver info file %s\n", name ); while ( fgets( buf, BUFFER2_SIZE, fd ) != NULL ) { fprintf( fp_drvdb, "%s", buf ); @@ -2713,7 +2713,7 @@ if (( dispatch_table = (PLDispatchTable **) malloc(( nplstaticdevices + npldynamicdevices ) * - sizeof ( PLDispatchTable * ))) == NULL ) + sizeof ( PLDispatchTable * ))) == NULL ) { plexit( "plInitDispatchTable: Insufficient memory" ); } @@ -2833,7 +2833,7 @@ * sequence number in the dispatch ttable entries. */ qsort( dispatch_table, npldrivers, sizeof ( PLDispatchTable* ), - plDispatchSequencer ); + plDispatchSequencer ); } /*--------------------------------------------------------------------------*\ @@ -2862,7 +2862,7 @@ { if (( *plsc->DevName == *dispatch_table[i]->pl_DevName ) && ( strncmp( plsc->DevName, - dispatch_table[i]->pl_DevName, length ) == 0 )) + dispatch_table[i]->pl_DevName, length ) == 0 )) break; } if ( i < npldrivers ) @@ -2873,7 +2873,7 @@ else { fprintf( stderr, "Requested device %s not available\n", - plsc->DevName ); + plsc->DevName ); } } @@ -2891,14 +2891,14 @@ for ( i = 0; i < npldrivers; i++ ) { fprintf( stdout, " <%2d> %-10s %s\n", i + 1, - dispatch_table[i]->pl_DevName, - dispatch_table[i]->pl_MenuStr ); + dispatch_table[i]->pl_DevName, + dispatch_table[i]->pl_MenuStr ); } if ( ipls == 0 ) fprintf( stdout, "\nEnter device number or keyword: " ); else fprintf( stdout, "\nEnter device number or keyword (stream %d): ", - (int) ipls ); + (int) ipls ); plio_fgets( response, sizeof ( response ), stdin ); @@ -2912,7 +2912,7 @@ for ( i = 0; i < npldrivers; i++ ) { if ( !strncmp( response, dispatch_table[i]->pl_DevName, - (unsigned int) length )) + (unsigned int) length )) break; } if ( i < npldrivers ) @@ -2998,7 +2998,7 @@ #endif /* LTDL_WIN32 */ pldebug( "plLoadDriver", "Trying to load %s on %s\n", - driver->drvnam, drvspec ); + driver->drvnam, drvspec ); driver->dlhand = lt_dlopenext( drvspec ); } @@ -3007,7 +3007,7 @@ if ( !driver->dlhand ) { pldebug( "plLoadDriver", "lt_dlopenext failed because of " - "the following reason:\n%s\n", lt_dlerror()); + "the following reason:\n%s\n", lt_dlerror()); fprintf( stderr, "Unable to load driver: %s.\n", driver->drvnam ); plexit( "Unable to load driver" ); } @@ -3107,9 +3107,9 @@ static void plgdevlst( const char **p_menustr, - const char **p_devname, - int *p_ndev, - int type ) + const char **p_devname, + int *p_ndev, + int type ) { int i, j; @@ -3141,7 +3141,7 @@ void c_plgpage( PLFLT *p_xp, PLFLT *p_yp, - PLINT *p_xleng, PLINT *p_yleng, PLINT *p_xoff, PLINT *p_yoff ) + PLINT *p_xleng, PLINT *p_yleng, PLINT *p_xoff, PLINT *p_yoff ) { *p_xp = plsc->xdpi; *p_yp = plsc->ydpi; @@ -3266,7 +3266,7 @@ void plsKeyEH( void ( *KeyEH )( PLGraphicsIn *, void *, int * ), - void *KeyEH_data ) + void *KeyEH_data ) { plsc->KeyEH = KeyEH; plsc->KeyEH_data = KeyEH_data; @@ -3276,7 +3276,7 @@ void plsButtonEH( void ( *ButtonEH )( PLGraphicsIn *, void *, int * ), - void *ButtonEH_data ) + void *ButtonEH_data ) { plsc->ButtonEH = ButtonEH; plsc->ButtonEH_data = ButtonEH_data; @@ -3913,14 +3913,14 @@ void plP_image( PLFLT *z, - PLINT ... [truncated message content] |