Commit 8a37c928 authored by Jehan's avatar Jehan

app, plug-ins, libgimp*: clean out all remaining trailing spaces/tabs.

Rather than just discovering them by chance, a simple grep and some
search and replace are much more efficient! :-)
Cleaning only done on C and automake files.
parent 2781450c
......@@ -78,7 +78,7 @@ static const GimpUnitDef gimp_unit_defs[GIMP_UNIT_END] =
*/
static const GimpUnitDef gimp_unit_percent =
{
FALSE, 0.0, 0, "percent", "%", "%",
FALSE, 0.0, 0, "percent", "%", "%",
NC_("singular", "percent"), NC_("plural", "percent")
};
......
......@@ -120,8 +120,8 @@ inv_show_status (void)
if (inv_game_over) {
t = g_strdup_printf (_("<b>GAME OVER</b> at level %d!"),
inv_level+1);
u = g_strdup_printf ("<big>%s</big>", t);
inv_level+1);
u = g_strdup_printf ("<big>%s</big>", t);
/* Translators: the first and third strings are similar to a
* title, and the second string is a small information text.
* The spaces are there only to separate all the strings, so
......@@ -149,7 +149,7 @@ inv_show_status (void)
s = g_strdup_printf (_("%1$s\t%2$s"), w,
_("Left/Right to move, Space to fire, 'p' to pause, 'q' to quit"));
g_free (t);
g_free (u);
g_free (u);
g_free (v);
g_free (w);
......@@ -215,7 +215,7 @@ inv_do_game_over (void)
GSList *li;
inv_game_over = TRUE;
for (li = inv_shots; li != NULL; li = li->next) {
InvShot *shot = li->data;
shot->good = FALSE;
......@@ -231,7 +231,7 @@ static GdkPixbuf *
pb_scale (GdkPixbuf *pb, double scale)
{
int w, h;
if (scale == 1.0)
return (GdkPixbuf *)g_object_ref ((GObject *)pb);
......
This diff is collapsed.
......@@ -33,7 +33,7 @@ AM_LDFLAGS = \
-Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec \
-Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type \
-Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type \
-Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type
-Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type
# Note that we have some duplicate entries here too to work around
# circular dependencies and systems on the same architectural layer as
......
......@@ -110,7 +110,7 @@ gimp_tools_setup_image (GimpTestFixture *fixture,
{
Gimp *gimp = GIMP (data);
gimp_test_utils_create_image (gimp,
gimp_test_utils_create_image (gimp,
GIMP_TEST_IMAGE_WIDTH,
GIMP_TEST_IMAGE_HEIGHT);
gimp_test_run_mainloop_until_idle ();
......
......@@ -44,7 +44,7 @@ struct _GimpCropOptions
* will resize the image/layer.
*/
gboolean allow_growing;
};
......
......@@ -689,7 +689,7 @@ gimp_rectangle_options_get_width_entry (GimpRectangleOptions *rectangle_options)
return private->width_entry;
}
/**
* gimp_rectangle_options_fixed_rule_changed:
* @combo_box:
......
......@@ -11,7 +11,7 @@ tagsdata_DATA = $(tagsdata_data_files)
EXTRA_DIST = \
$(tagsdata_DATA) \
$(tagsdata_in_files) \
gimp-tags.dtd
gimp-tags.dtd
DISTCLEANFILES = $(tagsdata_data_files)
......
......@@ -48,7 +48,7 @@ EXTRA_DIST = \
32x32/gimp.png \
48x48/gimp.png \
64x64/gimp.png \
256x256/gimp.png
256x256/gimp.png
DISTCLEANFILES = $(desktop_files) $(appdata_files)
......
......@@ -43,7 +43,7 @@ uninstall-libtool-import-lib:
endif
if MS_LIB_AVAILABLE
noinst_DATA = gimp-$(GIMP_API_VERSION).lib gimpui-$(GIMP_API_VERSION).lib
noinst_DATA = gimp-$(GIMP_API_VERSION).lib gimpui-$(GIMP_API_VERSION).lib
install-ms-lib:
$(INSTALL) gimp-$(GIMP_API_VERSION).lib $(DESTDIR)$(libdir)
......
......@@ -86,7 +86,7 @@ libgimpthumb_@GIMP_API_VERSION@_la_LDFLAGS = \
libgimpthumb_@GIMP_API_VERSION@_la_LIBADD = \
$(GDK_PIXBUF_LIBS) \
$(GIO_LIBS)
$(GIO_LIBS)
noinst_PROGRAMS = gimp-thumbnail-list
......
......@@ -342,7 +342,7 @@ EXTRA_PROGRAMS = \
test-eevl
test_preview_area_SOURCES = test-preview-area.c
test_preview_area_SOURCES = test-preview-area.c
test_preview_area_LDADD = \
$(GTK_LIBS) \
......
......@@ -111,7 +111,7 @@ typedef struct
GimpEevlToken current_token;
const gchar *start_of_current_token;
jmp_buf catcher;
const gchar *error_message;
......@@ -453,7 +453,6 @@ gimp_eevl_lex (GimpEevl *eva)
gimp_eevl_lex_accept_count (eva, 1, s[0]);
}
else
{
/* Attempt to parse a numeric value */
gchar *endptr = NULL;
......@@ -557,7 +556,7 @@ gimp_eevl_unit_identifier_size (const gchar *string,
length++;
}
}
return g_utf8_offset_to_pointer (start, length) - start;
}
......
......@@ -1367,7 +1367,7 @@ gimp_size_entry_eevl_unit_resolver (const gchar *identifier,
GimpSizeEntryField *gsef = (GimpSizeEntryField *) data;
gboolean resolve_default_unit = (identifier == NULL);
GimpUnit unit;
g_return_val_if_fail (gsef, FALSE);
g_return_val_if_fail (result != NULL, FALSE);
g_return_val_if_fail (GIMP_IS_SIZE_ENTRY (gsef->gse), FALSE);
......
......@@ -394,7 +394,7 @@ run (const gchar *name,
main_colorize (MC_DST_REMAP);
status = GIMP_PDB_SUCCESS;
}
else
else
{
status = GIMP_PDB_EXECUTION_ERROR;
}
......
......@@ -68,7 +68,7 @@ noinst_PROGRAMS = jpegqual
jpegqual_SOURCES = \
jpeg-quality.c \
jpeg-quality.h \
jpegqual.c
jpegqual.c
jpegqual_LDADD = \
$(JPEG_LIBS) \
......
......@@ -38,7 +38,7 @@ file_psd_SOURCES = \
psd-image-res-load.c \
psd-image-res-load.h \
psd-layer-res-load.c \
psd-layer-res-load.h
psd-layer-res-load.h
EXTRA_DIST = \
TODO.txt \
......
......@@ -1209,7 +1209,7 @@ gfig_paint_timeout (gpointer data)
gfig_paint_callback ();
paint_timeout = 0;
return FALSE;
}
......
......@@ -52,7 +52,7 @@
#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
* if you want the limit (max/min) macros for int types.
* if you want the limit (max/min) macros for int types.
*/
#ifndef __STDC_LIMIT_MACROS
#define __STDC_LIMIT_MACROS 1
......@@ -69,7 +69,7 @@ typedef uint32_t flex_uint32_t;
typedef signed char flex_int8_t;
typedef short int flex_int16_t;
typedef int flex_int32_t;
typedef unsigned char flex_uint8_t;
typedef unsigned char flex_uint8_t;
typedef unsigned short int flex_uint16_t;
typedef unsigned int flex_uint32_t;
......@@ -186,7 +186,7 @@ extern FILE *cern_in, *cern_out;
#define EOB_ACT_LAST_MATCH 2
#define YY_LESS_LINENO(n)
/* Return all but the first "n" matched characters back to the input stream. */
#define yyless(n) \
do \
......@@ -243,7 +243,7 @@ struct yy_buffer_state
int yy_bs_lineno; /**< The line count. */
int yy_bs_column; /**< The column count. */
/* Whether to try to fill the input buffer when we reach the
* end of it.
*/
......@@ -793,7 +793,7 @@ YY_DECL
register yy_state_type yy_current_state;
register char *yy_cp, *yy_bp;
register int yy_act;
#line 46 "imap_cern.l"
......@@ -1253,7 +1253,7 @@ static int yy_get_next_buffer (void)
{
register yy_state_type yy_current_state;
register char *yy_cp;
yy_current_state = (yy_start);
for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
......@@ -1313,7 +1313,7 @@ static int yy_get_next_buffer (void)
{
int c;
*(yy_c_buf_p) = (yy_hold_char);
if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
......@@ -1380,12 +1380,12 @@ static int yy_get_next_buffer (void)
/** Immediately switch to a different input stream.
* @param input_file A readable stream.
*
*
* @note This function does not reset the start condition to @c INITIAL .
*/
void cern_restart (FILE * input_file )
{
if ( ! YY_CURRENT_BUFFER ){
cern_ensure_buffer_stack ();
YY_CURRENT_BUFFER_LVALUE =
......@@ -1398,11 +1398,11 @@ static int yy_get_next_buffer (void)
/** Switch to a different input buffer.
* @param new_buffer The new input buffer.
*
*
*/
void cern__switch_to_buffer (YY_BUFFER_STATE new_buffer )
{
/* TODO. We should be able to replace this entire function body
* with
* cern_pop_buffer_state();
......@@ -1442,13 +1442,13 @@ static void cern__load_buffer_state (void)
/** Allocate and initialize an input buffer state.
* @param file A readable stream.
* @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
*
*
* @return the allocated buffer state.
*/
YY_BUFFER_STATE cern__create_buffer (FILE * file, int size )
{
YY_BUFFER_STATE b;
b = (YY_BUFFER_STATE) cern_alloc(sizeof( struct yy_buffer_state ) );
if ( ! b )
YY_FATAL_ERROR( "out of dynamic memory in cern__create_buffer()" );
......@@ -1471,11 +1471,11 @@ static void cern__load_buffer_state (void)
/** Destroy the buffer.
* @param b a buffer created with cern__create_buffer()
*
*
*/
void cern__delete_buffer (YY_BUFFER_STATE b )
{
if ( ! b )
return;
......@@ -1496,7 +1496,7 @@ static void cern__load_buffer_state (void)
{
int oerrno = errno;
cern__flush_buffer(b );
b->yy_input_file = file;
......@@ -1512,13 +1512,13 @@ static void cern__load_buffer_state (void)
}
b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
errno = oerrno;
}
/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
* @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
*
*
*/
void cern__flush_buffer (YY_BUFFER_STATE b )
{
......@@ -1547,7 +1547,7 @@ static void cern__load_buffer_state (void)
* the current state. This function will allocate the stack
* if necessary.
* @param new_buffer The new state.
*
*
*/
void cern_push_buffer_state (YY_BUFFER_STATE new_buffer )
{
......@@ -1577,7 +1577,7 @@ void cern_push_buffer_state (YY_BUFFER_STATE new_buffer )
/** Removes and deletes the top of the stack, if present.
* The next element becomes the new top.
*
*
*/
void cern_pop_buffer_state (void)
{
......@@ -1601,7 +1601,7 @@ void cern_pop_buffer_state (void)
static void cern_ensure_buffer_stack (void)
{
yy_size_t num_to_alloc;
if (!(yy_buffer_stack)) {
/* First allocation is just for 2 elements, since we don't know if this
......@@ -1614,9 +1614,9 @@ static void cern_ensure_buffer_stack (void)
);
if ( ! (yy_buffer_stack) )
YY_FATAL_ERROR( "out of dynamic memory in cern_ensure_buffer_stack()" );
memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
(yy_buffer_stack_max) = num_to_alloc;
(yy_buffer_stack_top) = 0;
return;
......@@ -1644,13 +1644,13 @@ static void cern_ensure_buffer_stack (void)
/** Setup the input buffer state to scan directly from a user-specified character buffer.
* @param base the character buffer
* @param size the size in bytes of the character buffer
*
* @return the newly allocated buffer state object.
*
* @return the newly allocated buffer state object.
*/
YY_BUFFER_STATE cern__scan_buffer (char * base, yy_size_t size )
{
YY_BUFFER_STATE b;
if ( size < 2 ||
base[size-2] != YY_END_OF_BUFFER_CHAR ||
base[size-1] != YY_END_OF_BUFFER_CHAR )
......@@ -1679,14 +1679,14 @@ YY_BUFFER_STATE cern__scan_buffer (char * base, yy_size_t size )
/** Setup the input buffer state to scan a string. The next call to cern_lex() will
* scan from a @e copy of @a str.
* @param yystr a NUL-terminated string to scan
*
*
* @return the newly allocated buffer state object.
* @note If you want to scan bytes that may contain NUL values, then use
* cern__scan_bytes() instead.
*/
YY_BUFFER_STATE cern__scan_string (yyconst char * yystr )
{
return cern__scan_bytes(yystr,strlen(yystr) );
}
......@@ -1694,7 +1694,7 @@ YY_BUFFER_STATE cern__scan_string (yyconst char * yystr )
* scan from a @e copy of @a bytes.
* @param yybytes the byte buffer to scan
* @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
*
*
* @return the newly allocated buffer state object.
*/
YY_BUFFER_STATE cern__scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len )
......@@ -1703,7 +1703,7 @@ YY_BUFFER_STATE cern__scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_l
char *buf;
yy_size_t n;
int i;
/* Get memory for full buffer, including space for trailing EOB's. */
n = _yybytes_len + 2;
buf = (char *) cern_alloc(n );
......@@ -1757,16 +1757,16 @@ static void yy_fatal_error (yyconst char* msg )
/* Accessor methods (get/set functions) to struct members. */
/** Get the current line number.
*
*
*/
int cern_get_lineno (void)
{
return cern_lineno;
}
/** Get the input stream.
*
*
*/
FILE *cern_get_in (void)
{
......@@ -1774,7 +1774,7 @@ FILE *cern_get_in (void)
}
/** Get the output stream.
*
*
*/
FILE *cern_get_out (void)
{
......@@ -1782,7 +1782,7 @@ FILE *cern_get_out (void)
}
/** Get the length of the current token.
*
*
*/
yy_size_t cern_get_leng (void)
{
......@@ -1790,7 +1790,7 @@ yy_size_t cern_get_leng (void)
}
/** Get the current token.
*
*
*/
char *cern_get_text (void)
......@@ -1800,18 +1800,18 @@ char *cern_get_text (void)
/** Set the current line number.
* @param line_number
*
*
*/
void cern_set_lineno (int line_number )
{
cern_lineno = line_number;
}
/** Set the input stream. This does not discard the current
* input buffer.
* @param in_str A readable stream.
*
*
* @see cern__switch_to_buffer
*/
void cern_set_in (FILE * in_str )
......@@ -1865,7 +1865,6 @@ static int yy_init_globals (void)
/* cern_lex_destroy is for both reentrant and non-reentrant scanners. */
int cern_lex_destroy (void)
{
/* Pop the buffer stack, destroying each element. */
while(YY_CURRENT_BUFFER){
cern__delete_buffer(YY_CURRENT_BUFFER );
......
/* A Bison parser, made by GNU Bison 2.6.1. */
/* Bison implementation for Yacc-like parsers in C
Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
......@@ -26,7 +26,7 @@
special exception, which will cause the skeleton and the resulting
Bison output files to be licensed under the GNU General Public
License without this special exception.
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
......@@ -1526,7 +1526,7 @@ yyreduce:
{
Polygon_t *polygon = ObjectToPolygon(current_object);
GdkPoint *point = new_point((gint) (yyvsp[(2) - (5)].value), (gint) (yyvsp[(4) - (5)].value));
polygon->points = g_list_append(polygon->points,
polygon->points = g_list_append(polygon->points,
(gpointer) point);
}
break;
......@@ -1556,7 +1556,7 @@ yyreduce:
MapInfo_t *info = get_map_info();
gchar *description;
description = g_strconcat(info->description, (yyvsp[(2) - (2)].id), "\n",
description = g_strconcat(info->description, (yyvsp[(2) - (2)].id), "\n",
NULL);
g_strreplace(&info->description, description);
g_free ((yyvsp[(2) - (2)].id));
......@@ -1798,7 +1798,7 @@ yyreturn:
#line 162 "imap_cern.y"
static void
static void
cern_error(char* s)
{
extern FILE *cern_in;
......
/* A Bison parser, made by GNU Bison 2.6.1. */
/* Bison interface for Yacc-like parsers in C
Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
......@@ -26,7 +26,7 @@
special exception, which will cause the skeleton and the resulting
Bison output files to be licensed under the GNU General Public
License without this special exception.
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
......
......@@ -52,7 +52,7 @@
#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
* if you want the limit (max/min) macros for int types.
* if you want the limit (max/min) macros for int types.
*/
#ifndef __STDC_LIMIT_MACROS
#define __STDC_LIMIT_MACROS 1
......@@ -69,7 +69,7 @@ typedef uint32_t flex_uint32_t;
typedef signed char flex_int8_t;
typedef short int flex_int16_t;
typedef int flex_int32_t;
typedef unsigned char flex_uint8_t;
typedef unsigned char flex_uint8_t;
typedef unsigned short int flex_uint16_t;
typedef unsigned int flex_uint32_t;
......@@ -186,7 +186,7 @@ extern FILE *csim_in, *csim_out;
#define EOB_ACT_LAST_MATCH 2
#define YY_LESS_LINENO(n)
/* Return all but the first "n" matched characters back to the input stream. */
#define yyless(n) \
do \
......@@ -243,7 +243,7 @@ struct yy_buffer_state
int yy_bs_lineno; /**< The line count. */
int yy_bs_column; /**< The column count. */
/* Whether to try to fill the input buffer when we reach the
* end of it.
*/
......@@ -818,7 +818,7 @@ YY_DECL
register yy_state_type yy_current_state;
register char *yy_cp, *yy_bp;
register int yy_act;
#line 47 "imap_csim.l"
......@@ -1375,7 +1375,7 @@ static int yy_get_next_buffer (void)
{
register yy_state_type yy_current_state;
register char *yy_cp;
yy_current_state = (yy_start);
for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
......@@ -1435,7 +1435,7 @@ static int yy_get_next_buffer (void)
{
int c;
*(yy_c_buf_p) = (yy_hold_char);
if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
......@@ -1502,12 +1502,11 @@ static int yy_get_next_buffer (void)
/** Immediately switch to a different input stream.
* @param input_file A readable stream.
*
*
* @note This function does not reset the start condition to @c INITIAL .
*/
void csim_restart (FILE * input_file )
{
if ( ! YY_CURRENT_BUFFER ){
csim_ensure_buffer_stack ();
YY_CURRENT_BUFFER_LVALUE =
......@@ -1520,11 +1519,10 @@ static int yy_get_next_buffer (void)
/** Switch to a different input buffer.
* @param new_buffer The new input buffer.
*
*
*/
void csim__switch_to_buffer (YY_BUFFER_STATE new_buffer )
{
/* TODO. We should be able to replace this entire function body
* with
* csim_pop_buffer_state();
......@@ -1564,13 +1562,13 @@ static void csim__load_buffer_state (void)
/** Allocate and initialize an input buffer state.
* @param file A readable stream.
* @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
*
*
* @return the allocated buffer state.
*/
YY_BUFFER_STATE csim__create_buffer (FILE * file, int size )
{
YY_BUFFER_STATE b;
b = (YY_BUFFER_STATE) csim_alloc(sizeof( struct yy_buffer_state ) );
if ( ! b )
YY_FATAL_ERROR( "out of dynamic memory in csim__create_buffer()" );
......@@ -1593,11 +1591,10 @@ static void csim__load_buffer_state (void)
/** Destroy the buffer.
* @param b a buffer created with csim__create_buffer()
*
*
*/
void csim__delete_buffer (YY_BUFFER_STATE b )
{
if ( ! b )
return;
......@@ -1618,7 +1615,7 @@ static void csim__load_buffer_state (void)
{
int oerrno = errno;
csim__flush_buffer(b );
b->yy_input_file = file;
......@@ -1634,13 +1631,13 @@ static void csim__load_buffer_state (void)
}
b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
errno = oerrno;
}
/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
* @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
*
*
*/
void csim__flush_buffer (YY_BUFFER_STATE b )
{
......@@ -1669,7 +1666,7 @@ static void csim__load_buffer_state (void)
* the current state. This function will allocate the stack
* if necessary.
* @param new_buffer The new state.
*
*
*/
void csim_push_buffer_state (YY_BUFFER_STATE new_buffer )
{
......@@ -1699,7 +1696,7 @@ void csim_push_buffer_state (YY_BUFFER_STATE new_buffer )
/** Removes and deletes the top of the stack, if present.
* The next element becomes the new top.
*
*
*/
void csim_pop_buffer_state (void)
{
...