Skip to content

Commit

Permalink
Style only change: remove trailing whitespaces
Browse files Browse the repository at this point in the history 
git-svn-id: http://svn.osgeo.org/postgis/trunk@14869 b70326c6-7e19-0410-871a-916f4a2858ee
  • Loading branch information
Sandro Santilli committed Apr 27, 2016
1 parent de88ae4 commit f6ed58d
Show file tree
Hide file tree
Showing 332 changed files with 5,867 additions and 5,867 deletions.
258 changes: 129 additions & 129 deletions extensions/address_standardizer/analyze.c
View file

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions extensions/address_standardizer/err_param.c
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* -- err_param.c
/* -- err_param.c
This file handles the buffering and output of errors
Expand Down Expand Up @@ -39,7 +39,7 @@ static int turn_off_error_log( ERR_PARAM * ) ;
err_mem = err_p -> err_array ; \
err_p -> error_buf = err_mem -> content_buf ; \
err_mem -> is_fatal = TRUE ; \
BLANK_STRING( err_mem -> content_buf )
BLANK_STRING( err_mem -> content_buf )



Expand Down Expand Up @@ -79,10 +79,10 @@ ERR_PARAM *init_errors( PAGC_GLOBAL *pagc_glo_p ,
log_name ) ;
#endif
return NULL ;
}
}
}
return err_p ;
}
}


/* ------------------------------------------------------------
Expand Down Expand Up @@ -115,7 +115,7 @@ void close_errors( ERR_PARAM *err_p ) {
#endif
}
BLANK_STRING( err_out_buf ) ;
}
}
FREE_AND_NULL( err_p ) ;
}

Expand All @@ -127,8 +127,8 @@ stdio.h (fclose)
static int turn_off_error_log( ERR_PARAM *err_p ) {
ERR_REC *err_mem ;

if ( ( err_p == NULL ) ||
( err_p -> stream == NULL ) ) {
if ( ( err_p == NULL ) ||
( err_p -> stream == NULL ) ) {
return FALSE ;
}
fclose( err_p -> stream ) ;
Expand All @@ -140,7 +140,7 @@ static int turn_off_error_log( ERR_PARAM *err_p ) {
/* ----------------------------------------------------------
err_param.c (empty_errors)
calls : err_param.c (turn_off_error_log)
returns FALSE when all errors have been reported.
returns FALSE when all errors have been reported.
TRUE otherwise
------------------------------------------------------------*/
int empty_errors( ERR_PARAM *err_p ,
Expand Down Expand Up @@ -168,7 +168,7 @@ int empty_errors( ERR_PARAM *err_p ,
err_mem = err_p -> err_array + err_p -> first_err ;
append_string_to_max( err_dest ,
err_mem -> content_buf ,
MAXSTRLEN ) ;
MAXSTRLEN ) ;
*is_fatal = err_mem -> is_fatal ;

/* -- update the low mark -- */
Expand Down Expand Up @@ -219,7 +219,7 @@ void register_error( ERR_PARAM *err_p ) {
if ( strlen( err_p -> error_buf ) > MAXSTRLEN ) {
#ifndef NO_STDERR_OUTPUT
PRINT_ERROR( "Error message %s is too long" ,
err_p -> error_buf ) ;
err_p -> error_buf ) ;
#endif
return ;
}
Expand Down Expand Up @@ -253,16 +253,16 @@ void register_error( ERR_PARAM *err_p ) {
}
} else {
/* -- last_err points to the next one to fill -- */
err_p -> last_err ++ ;
err_p -> last_err ++ ;
err_mem = err_p -> err_array + err_p -> last_err ;
}

/* -- reset error_buf to the new content_buf -- */
err_p -> error_buf = err_mem -> content_buf ;
err_p -> error_buf = err_mem -> content_buf ;
BLANK_STRING( err_mem -> content_buf ) ;
err_p -> next_fatal = TRUE ;
return ;
}
}


/*==========================================
Expand Down
72 changes: 36 additions & 36 deletions extensions/address_standardizer/export.c
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* -- export.c
/* -- export.c
This file contains the routines for extracting the sequence of
postal attributes and definitions produced by the standardizer
Expand Down Expand Up @@ -28,11 +28,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SO
#define ORDER_DISPLACEMENT 2

/* -- local prototypes -- */
static void _copy_standard_( STAND_PARAM * , SYMB , int , int ) ;
static void _scan_target_( STAND_PARAM * , SYMB , int ) ;
static void _copy_standard_( STAND_PARAM * , SYMB , int , int ) ;
static void _scan_target_( STAND_PARAM * , SYMB , int ) ;
static char *_get_standard_( STAND_PARAM * , int , int ) ;
static char *_get_definition_text_( STAND_PARAM * , int ) ;

//#ifndef BUILD_API

/* -- local storage -- */
Expand Down Expand Up @@ -116,8 +116,8 @@ void init_output_fields( STAND_PARAM *__stand_param__ , int which_fields )
{
__standard_fields__[i][0] = SENTINEL ;
}
}
else
}
else
{
/*-- Clean only one set --*/
if ( which_fields == RIGHT )
Expand All @@ -127,8 +127,8 @@ void init_output_fields( STAND_PARAM *__stand_param__ , int which_fields )
{
__standard_fields__[i][0] = SENTINEL ;
}
}
else
}
else
{
/*-- Erase the micro fields only --*/
for ( i = BLDNG ; i < CITY ; i++ )
Expand Down Expand Up @@ -174,12 +174,12 @@ static char *_get_definition_text_( STAND_PARAM *__stand_param__ , int lex_pos )
export.c (stuff_fields)
--calls export.c (_scan_target_)
-------------------------------------------*/
void stuff_fields( STAND_PARAM *__stand_param__ )
void stuff_fields( STAND_PARAM *__stand_param__ )
{
int fld ;
/*-- Translate the symbols and definitions of the standardization into
the __standard_fields__ for output --*/
for (fld = 0 ;fld < NEEDHEAD ;fld++)
for (fld = 0 ;fld < NEEDHEAD ;fld++)
{
/*-- Fields that correspond one to one with the symbols --*/
_scan_target_(__stand_param__ ,fld,fld) ;
Expand Down Expand Up @@ -207,8 +207,8 @@ void send_fields_to_stream( char **__standard_fields__ , FILE *__dest_file__ , i
if (__dest_file__ != NULL)
{
fprintf(__dest_file__,"%s\n",(is_landmark? __landmark_record_start_tag__[opt] : __record_start_tag__[opt])) ;
}
else
}
else
{
printf("%s\n",(is_landmark? __landmark_record_start_tag__[opt] : __record_start_tag__[opt])) ;
}
Expand Down Expand Up @@ -241,8 +241,8 @@ void send_fields_to_stream( char **__standard_fields__ , FILE *__dest_file__ , i
default :
__source_start_tag__ = ( char * ) __field_start_tag__[loc][opt] ;
}
}
else
}
else
{
__source_start_tag__ = (char *) __field_start_tag__[loc][opt] ;
}
Expand All @@ -269,7 +269,7 @@ void send_fields_to_stream( char **__standard_fields__ , FILE *__dest_file__ , i
__source_end_tag__ = ( char * ) __field_tag_end__[ loc ][ opt ] ;
}
}
else
else
{
__source_end_tag__ = ( char * ) __field_tag_end__[ loc ][ opt ] ;
}
Expand All @@ -278,29 +278,29 @@ void send_fields_to_stream( char **__standard_fields__ , FILE *__dest_file__ , i
if ( __dest_file__ != NULL )
{
fprintf( __dest_file__ , "%s" , __line_buf__ ) ;
}
else
}
else
{
printf( "%s" , __line_buf__ ) ;
}
}
}
if ( opt < NO_FORMAT )
if ( opt < NO_FORMAT )
{
if ( __dest_file__ != NULL )
if ( __dest_file__ != NULL )
{
fprintf( __dest_file__ , "%s\n", ( is_landmark? __landmark_record_end_tag__[ opt ] : __record_end_tag__[ opt ]));
}
else
}
else
{
printf( "%s\n" , ( is_landmark? __landmark_record_end_tag__[ opt ] : __record_end_tag__[ opt ] ) );
}
}
if ( __dest_file__ != NULL )
{
fflush( __dest_file__ ) ;
}
else
}
else
{
fflush( stdout ) ;
}
Expand Down Expand Up @@ -331,7 +331,7 @@ static char *_get_standard_(STAND_PARAM *__stand_param__ ,int lex_pos, int outpu
{
if (__scan_DEF__->Type == ORD)
{
if ((__selected_standardization__ = __scan_DEF__->Standard) != NULL)
if ((__selected_standardization__ = __scan_DEF__->Standard) != NULL)
{
return (__selected_standardization__) ;
}
Expand All @@ -353,18 +353,18 @@ static char *_get_standard_(STAND_PARAM *__stand_param__ ,int lex_pos, int outpu
char *__zero_pointer__ ;
char *__buffer_pointer__ = __zero_pointer__ = __selected_standardization__ ;
while ( *__zero_pointer__ == '0' ) __zero_pointer__++ ; /*-- Move to first nonzero character --*/
while ( *__zero_pointer__ != SENTINEL ) *__buffer_pointer__++ = *__zero_pointer__++ ; /*-- Move down in buffer --*/
while ( *__zero_pointer__ != SENTINEL ) *__buffer_pointer__++ = *__zero_pointer__++ ; /*-- Move down in buffer --*/
/*-- Trim down all-zeroes to a single zero: if deleting all
the zeros leaves an empty buffer, put a zero back --*/
if ( __buffer_pointer__ == __selected_standardization__ ) *__buffer_pointer__++ = '0' ;
if ( __buffer_pointer__ == __selected_standardization__ ) *__buffer_pointer__++ = '0' ;
BLANK_STRING( __buffer_pointer__ ) ;
}
return ( __selected_standardization__ ) ;
}

/*-----------------------------------------
export.c (_scan_target_ )
-- calls export.c (_copy_standard_)
-- calls export.c (_copy_standard_)
-- called by export.c (stuff_fields)
-------------------------------------------*/
static void _scan_target_(STAND_PARAM *__stand_param__,SYMB sym , int dest)
Expand All @@ -387,11 +387,11 @@ static void _scan_target_(STAND_PARAM *__stand_param__,SYMB sym , int dest)
}

/*-----------------------------------------
export.c (_copy_standard_)
-- called by export.c (_scan_target_) --
--calls export.c (_get_standard_,
strlen, strcpy
uses macro SPACE_APPEND_WITH_LEN
export.c (_copy_standard_)
-- called by export.c (_scan_target_) --
--calls export.c (_get_standard_,
strlen, strcpy
uses macro SPACE_APPEND_WITH_LEN
-------------------------------------------*/
static void _copy_standard_( STAND_PARAM *__stand_param__ , SYMB output_sym , int fld , int lex_pos )
{
Expand All @@ -407,7 +407,7 @@ static void _copy_standard_( STAND_PARAM *__stand_param__ , SYMB output_sym , in
if ( *__dest_buf__ != SENTINEL )
{
SPACE_APPEND_WITH_LEN( __dest_buf__ , __stan_str__ , MAXFLDLEN ) ;
}
}
else if ( output_sym == UNITT )
{
/*-- If the unit id type is missing, one needs to be provided.
Expand All @@ -418,13 +418,13 @@ static void _copy_standard_( STAND_PARAM *__stand_param__ , SYMB output_sym , in

strcpy( __dest_buf__ , "# " ) ; /* -- reconsider this -- */
append_string_to_max( __dest_buf__ , __stan_str__ , MAXFLDLEN ) ;
}
}
else if ( output_sym == BOXT )
{
strcpy( __dest_buf__, "BOX " ) ;
append_string_to_max( __dest_buf__ , __stan_str__ ,MAXFLDLEN ) ;
}
else
}
else
{
strcpy( __dest_buf__ , __stan_str__ ) ;
}
Expand Down
Loading

0 comments on commit f6ed58d

Please sign in to comment.