@@ -429,7 +429,7 @@ static void
429429report_multiple_error_messages (Step * step ,int nextra ,Step * * extrastep )
430430{
431431PQExpBufferData buffer ;
432- int n ;
432+ int n ;
433433
434434if (nextra == 0 )
435435{
@@ -475,8 +475,8 @@ run_permutation(TestSpec *testspec, int nsteps, Step **steps)
475475int w ;
476476int nwaiting = 0 ;
477477int nerrorstep = 0 ;
478- Step * * waiting ;
479- Step * * errorstep ;
478+ Step * * waiting ;
479+ Step * * errorstep ;
480480
481481/*
482482 * In dry run mode, just display the permutation in the same format used
@@ -540,13 +540,13 @@ run_permutation(TestSpec *testspec, int nsteps, Step **steps)
540540for (i = 0 ;i < nsteps ;i ++ )
541541{
542542Step * step = steps [i ];
543- Step * oldstep = NULL ;
543+ Step * oldstep = NULL ;
544544PGconn * conn = conns [1 + step -> session ];
545545bool mustwait ;
546546
547547/*
548- * Check whether the session that needs to perform the next step
549- *is still blocked on an earlier step. If so, wait for it to finish.
548+ * Check whether the session that needs to perform the next step is
549+ * still blocked on an earlier step. If so, wait for it to finish.
550550 *
551551 * (In older versions of this tool, we allowed precisely one session
552552 * to be waiting at a time. If we reached a step that required that
@@ -762,7 +762,7 @@ try_complete_step(Step *step, int flags)
762762ntuples = PQntuples (res );
763763PQclear (res );
764764
765- if (ntuples >=1 )/* waiting to acquire a lock */
765+ if (ntuples >=1 )/* waiting to acquire a lock */
766766{
767767if (!(flags & STEP_RETRY ))
768768printf ("step %s: %s <waiting ...>\n" ,
@@ -781,19 +781,19 @@ try_complete_step(Step *step, int flags)
781781/*
782782 * After 60 seconds, try to cancel the query.
783783 *
784- * If the user tries to test an invalid permutation, we don't
785- *want to hang forever, especially when this is running in the
784+ * If the user tries to test an invalid permutation, we don't want
785+ * to hang forever, especially when this is running in the
786786 * buildfarm. So try to cancel it after a minute. This will
787787 * presumably lead to this permutation failing, but remaining
788788 * permutations and tests should still be OK.
789789 */
790790if (td > 60 * USECS_PER_SEC && !canceled )
791791{
792- PGcancel * cancel = PQgetCancel (conn );
792+ PGcancel * cancel = PQgetCancel (conn );
793793
794794if (cancel != NULL )
795795{
796- char buf [256 ];
796+ char buf [256 ];
797797
798798if (PQcancel (cancel ,buf ,sizeof (buf )))
799799canceled = true;