Re-run indent.sh under GNU indent 2.2.13

Slight change to its default behavior re: pointer variables
(before: "type * var"; now seems to prefer: "type *var").
This commit is contained in:
Bill Kendrick 2024-10-20 11:22:30 -07:00
parent 073ac19ce6
commit 44d7d0ee5d
94 changed files with 2831 additions and 2856 deletions

View file

@ -61,7 +61,7 @@ Uint32 rivulet_api_version(void)
return (TP_MAGIC_API_VERSION);
}
int rivulet_init(magic_api * api)
int rivulet_init(magic_api *api)
{
char fname[1024];
@ -107,13 +107,13 @@ int rivulet_init(magic_api * api)
return (1);
}
int rivulet_get_tool_count(magic_api * api ATTRIBUTE_UNUSED)
int rivulet_get_tool_count(magic_api *api ATTRIBUTE_UNUSED)
{
return (1);
}
SDL_Surface *rivulet_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
SDL_Surface *rivulet_get_icon(magic_api *api, int which ATTRIBUTE_UNUSED)
{
char fname[1024];
@ -122,32 +122,32 @@ SDL_Surface *rivulet_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
return (IMG_Load(fname));
}
char *rivulet_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
char *rivulet_get_name(magic_api *api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{
return strdup(gettext("Rivulet"));
}
int rivulet_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
int rivulet_get_group(magic_api *api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{
return MAGIC_TYPE_DISTORTS;
}
char *rivulet_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
char *rivulet_get_description(magic_api *api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{
return (gettext("Click and drag downward to add water rivulets to your drawing"));
}
int rivulet_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
int rivulet_requires_colors(magic_api *api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{
return 0;
}
int rivulet_modes(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
int rivulet_modes(magic_api *api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{
return MODE_PAINT;
}
void rivulet_shutdown(magic_api * api ATTRIBUTE_UNUSED)
void rivulet_shutdown(magic_api *api ATTRIBUTE_UNUSED)
{
if (snd_effect != NULL)
Mix_FreeChunk(snd_effect);
@ -176,8 +176,8 @@ void rivulet_shutdown(magic_api * api ATTRIBUTE_UNUSED)
void
rivulet_click(magic_api * api, int which, int mode ATTRIBUTE_UNUSED,
SDL_Surface * canvas, SDL_Surface * snapshot, int x, int y, SDL_Rect * update_rect)
rivulet_click(magic_api *api, int which, int mode ATTRIBUTE_UNUSED,
SDL_Surface *canvas, SDL_Surface *snapshot, int x, int y, SDL_Rect *update_rect)
{
riv_x = x;
riv_y = y - 1;
@ -196,9 +196,9 @@ rivulet_click(magic_api * api, int which, int mode ATTRIBUTE_UNUSED,
void
rivulet_drag(magic_api * api ATTRIBUTE_UNUSED, int which, SDL_Surface * canvas,
SDL_Surface * snapshot, int ox ATTRIBUTE_UNUSED,
int oy ATTRIBUTE_UNUSED, int x, int y, SDL_Rect * update_rect)
rivulet_drag(magic_api *api ATTRIBUTE_UNUSED, int which, SDL_Surface *canvas,
SDL_Surface *snapshot, int ox ATTRIBUTE_UNUSED,
int oy ATTRIBUTE_UNUSED, int x, int y, SDL_Rect *update_rect)
{
int old_riv_x, old_riv_y;
@ -231,8 +231,8 @@ rivulet_drag(magic_api * api ATTRIBUTE_UNUSED, int which, SDL_Surface * canvas,
}
void rivulet_release(magic_api * api, int which ATTRIBUTE_UNUSED, SDL_Surface * canvas, SDL_Surface * snapshot ATTRIBUTE_UNUSED, int x, int y, /* ignored and reused in a for-loop */
SDL_Rect * update_rect)
void rivulet_release(magic_api *api, int which ATTRIBUTE_UNUSED, SDL_Surface *canvas, SDL_Surface *snapshot ATTRIBUTE_UNUSED, int x, int y, /* ignored and reused in a for-loop */
SDL_Rect *update_rect)
{
int src_x, src_y, idx;
double radius, angle_deg, angle_rad;
@ -311,14 +311,14 @@ void rivulet_release(magic_api * api, int which ATTRIBUTE_UNUSED, SDL_Surface *
}
void rivulet_set_color(magic_api * api, int which, SDL_Surface * canvas,
SDL_Surface * last, Uint8 r, Uint8 g, Uint8 b, SDL_Rect * update_rect)
void rivulet_set_color(magic_api *api, int which, SDL_Surface *canvas,
SDL_Surface *last, Uint8 r, Uint8 g, Uint8 b, SDL_Rect *update_rect)
{
}
void rivulet_line_callback_drag(void *ptr, int which ATTRIBUTE_UNUSED,
SDL_Surface * canvas, SDL_Surface * snapshot ATTRIBUTE_UNUSED, int x, int y)
SDL_Surface *canvas, SDL_Surface *snapshot ATTRIBUTE_UNUSED, int x, int y)
{
magic_api *api;
SDL_Rect dest;
@ -395,8 +395,8 @@ void rivulet_line_callback_drag(void *ptr, int which ATTRIBUTE_UNUSED,
}
}
void rivulet_switchin(magic_api * api ATTRIBUTE_UNUSED,
int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, SDL_Surface * canvas)
void rivulet_switchin(magic_api *api ATTRIBUTE_UNUSED,
int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, SDL_Surface *canvas)
{
if (riv_radii == NULL)
{
@ -442,13 +442,13 @@ void rivulet_switchin(magic_api * api ATTRIBUTE_UNUSED,
SDL_BlitSurface(canvas, NULL, rivulet_snapshot, NULL);
}
void rivulet_switchout(magic_api * api ATTRIBUTE_UNUSED,
int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, SDL_Surface * canvas ATTRIBUTE_UNUSED)
void rivulet_switchout(magic_api *api ATTRIBUTE_UNUSED,
int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, SDL_Surface *canvas ATTRIBUTE_UNUSED)
{
zero_riv_arrays(canvas);
}
void zero_riv_arrays(SDL_Surface * canvas)
void zero_riv_arrays(SDL_Surface *canvas)
{
if (riv_radii != NULL)
memset(riv_radii, 0, (canvas->w * canvas->h));

View file

@ -39,7 +39,7 @@ Uint32 specular_api_version(void)
return (TP_MAGIC_API_VERSION);
}
int specular_init(magic_api * api, Uint8 disabled_features, Uint8 complexity_level)
int specular_init(magic_api *api, Uint8 disabled_features, Uint8 complexity_level)
{
int i;
char filename[1024];
@ -51,12 +51,12 @@ int specular_init(magic_api * api, Uint8 disabled_features, Uint8 complexity_lev
}
int specular_get_tool_count(magic_api * api)
int specular_get_tool_count(magic_api *api)
{
return (1);
}
SDL_Surface *specular_get_icon(magic_api * api, int which)
SDL_Surface *specular_get_icon(magic_api *api, int which)
{
char filename[1024];
@ -66,13 +66,13 @@ SDL_Surface *specular_get_icon(magic_api * api, int which)
}
char *specular_get_name(magic_api * api, int which)
char *specular_get_name(magic_api *api, int which)
{
return strdup(gettext("Specular Reflection"));
}
int specular_get_group(magic_api * api, int which)
int specular_get_group(magic_api *api, int which)
{
return MAGIC_TYPE_PAINTING;
}
@ -84,7 +84,7 @@ int specular_get_order(int which)
}
char *specular_get_description(magic_api * api, int which, int mode)
char *specular_get_description(magic_api *api, int which, int mode)
{
return
strdup(gettext
@ -92,31 +92,31 @@ char *specular_get_description(magic_api * api, int which, int mode)
}
int specular_requires_colors(magic_api * api, int which)
int specular_requires_colors(magic_api *api, int which)
{
return 0;
}
int specular_modes(magic_api * api, int which)
int specular_modes(magic_api *api, int which)
{
return MODE_PAINT;
}
Uint8 specular_accepted_sizes(magic_api * api, int which, int mode)
Uint8 specular_accepted_sizes(magic_api *api, int which, int mode)
{
return 4;
}
Uint8 specular_default_size(magic_api * api, int which, int mode)
Uint8 specular_default_size(magic_api *api, int which, int mode)
{
return 2;
}
void specular_shutdown(magic_api * api)
void specular_shutdown(magic_api *api)
{
if (snd_effect != NULL)
{
@ -126,16 +126,16 @@ void specular_shutdown(magic_api * api)
void
specular_click(magic_api * api, int which, int mode,
SDL_Surface * canvas, SDL_Surface * snapshot, int x, int y, SDL_Rect * update_rect)
specular_click(magic_api *api, int which, int mode,
SDL_Surface *canvas, SDL_Surface *snapshot, int x, int y, SDL_Rect *update_rect)
{
specular_drag(api, which, canvas, snapshot, x, y, x, y, update_rect);
}
void
specular_drag(magic_api * api, int which,
SDL_Surface * canvas, SDL_Surface * snapshot, int old_x, int old_y, int x, int y, SDL_Rect * update_rect)
specular_drag(magic_api *api, int which,
SDL_Surface *canvas, SDL_Surface *snapshot, int old_x, int old_y, int x, int y, SDL_Rect *update_rect)
{
SDL_LockSurface(snapshot);
SDL_LockSurface(canvas);
@ -169,24 +169,24 @@ specular_drag(magic_api * api, int which,
}
void
specular_release(magic_api * api, int which,
SDL_Surface * canvas, SDL_Surface * snapshot, int x, int y, SDL_Rect * update_rect)
specular_release(magic_api *api, int which,
SDL_Surface *canvas, SDL_Surface *snapshot, int x, int y, SDL_Rect *update_rect)
{
}
void specular_set_color(magic_api * api, int which, SDL_Surface * canvas, SDL_Surface * snapshot, Uint8 r, Uint8 g,
Uint8 b, SDL_Rect * update_rect)
void specular_set_color(magic_api *api, int which, SDL_Surface *canvas, SDL_Surface *snapshot, Uint8 r, Uint8 g,
Uint8 b, SDL_Rect *update_rect)
{
}
void specular_set_size(magic_api * api, int which, int mode, SDL_Surface * canvas, SDL_Surface * snapshot, Uint8 size,
SDL_Rect * update_rect)
void specular_set_size(magic_api *api, int which, int mode, SDL_Surface *canvas, SDL_Surface *snapshot, Uint8 size,
SDL_Rect *update_rect)
{
specular_size = size * 16;
}
void specular_line_callback(void *pointer, int which, SDL_Surface * canvas, SDL_Surface * snapshot, int x, int y)
void specular_line_callback(void *pointer, int which, SDL_Surface *canvas, SDL_Surface *snapshot, int x, int y)
{
magic_api *api = (magic_api *) pointer;
int xx, yy, ysrc;
@ -214,10 +214,10 @@ void specular_line_callback(void *pointer, int which, SDL_Surface * canvas, SDL_
}
}
void specular_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas)
void specular_switchin(magic_api *api, int which, int mode, SDL_Surface *canvas)
{
}
void specular_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas)
void specular_switchout(magic_api *api, int which, int mode, SDL_Surface *canvas)
{
}

View file

@ -110,7 +110,7 @@ Uint32 warp_api_version(void)
}
// Load our sfx:
int warp_init(magic_api * api, Uint32 disabled_features ATTRIBUTE_UNUSED)
int warp_init(magic_api *api, Uint32 disabled_features ATTRIBUTE_UNUSED)
{
int i;
char fname[1024];
@ -125,13 +125,13 @@ int warp_init(magic_api * api, Uint32 disabled_features ATTRIBUTE_UNUSED)
}
// We have multiple tools:
int warp_get_tool_count(magic_api * api ATTRIBUTE_UNUSED)
int warp_get_tool_count(magic_api *api ATTRIBUTE_UNUSED)
{
return NUM_TOOLS;
}
// Load our icons:
SDL_Surface *warp_get_icon(magic_api * api, int which)
SDL_Surface *warp_get_icon(magic_api *api, int which)
{
char fname[1024];
@ -140,26 +140,26 @@ SDL_Surface *warp_get_icon(magic_api * api, int which)
}
// Return our names, localized:
char *warp_get_name(magic_api * api ATTRIBUTE_UNUSED, int which)
char *warp_get_name(magic_api *api ATTRIBUTE_UNUSED, int which)
{
return (strdup(gettext(warp_tool_names[which])));
}
// Return our group:
int warp_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
int warp_get_group(magic_api *api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{
return MAGIC_TYPE_PAINTING;
}
// Return our descriptions, localized:
char *warp_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode ATTRIBUTE_UNUSED)
char *warp_get_description(magic_api *api ATTRIBUTE_UNUSED, int which, int mode ATTRIBUTE_UNUSED)
{
return (strdup(gettext_noop("Warp"))); // FIXME
}
// Affect the canvas on drag:
void warp_drag(magic_api * api, int which, SDL_Surface * canvas,
SDL_Surface * last, int ox, int oy, int x, int y, SDL_Rect * update_rect)
void warp_drag(magic_api *api, int which, SDL_Surface *canvas,
SDL_Surface *last, int ox, int oy, int x, int y, SDL_Rect *update_rect)
{
int xx, yy;
float stroke_len;
@ -229,7 +229,7 @@ void warp_drag(magic_api * api, int which, SDL_Surface * canvas,
api->playsound(warp_snd[which], (x * 255) / canvas->w, 255);
}
static void warp_linecb(void *ptr, int which, SDL_Surface * canvas, SDL_Surface * last, int x, int y)
static void warp_linecb(void *ptr, int which, SDL_Surface *canvas, SDL_Surface *last, int x, int y)
{
float intensity;
magic_api *api = (magic_api *) ptr;
@ -255,8 +255,8 @@ static void warp_linecb(void *ptr, int which, SDL_Surface * canvas, SDL_Surface
}
// Affect the canvas on click:
void warp_click(magic_api * api, int which, int mode ATTRIBUTE_UNUSED,
SDL_Surface * canvas, SDL_Surface * last, int x, int y, SDL_Rect * update_rect)
void warp_click(magic_api *api, int which, int mode ATTRIBUTE_UNUSED,
SDL_Surface *canvas, SDL_Surface *last, int x, int y, SDL_Rect *update_rect)
{
if (warp_mesh == NULL)
return;
@ -266,16 +266,16 @@ void warp_click(magic_api * api, int which, int mode ATTRIBUTE_UNUSED,
warp_drag(api, which, canvas, last, x, y, x, y, update_rect);
}
void warp_release(magic_api * api ATTRIBUTE_UNUSED,
void warp_release(magic_api *api ATTRIBUTE_UNUSED,
int which ATTRIBUTE_UNUSED,
SDL_Surface * canvas ATTRIBUTE_UNUSED,
SDL_Surface * last ATTRIBUTE_UNUSED,
int x ATTRIBUTE_UNUSED, int y ATTRIBUTE_UNUSED, SDL_Rect * update_rect ATTRIBUTE_UNUSED)
SDL_Surface *canvas ATTRIBUTE_UNUSED,
SDL_Surface *last ATTRIBUTE_UNUSED,
int x ATTRIBUTE_UNUSED, int y ATTRIBUTE_UNUSED, SDL_Rect *update_rect ATTRIBUTE_UNUSED)
{
}
// Clean up
void warp_shutdown(magic_api * api ATTRIBUTE_UNUSED)
void warp_shutdown(magic_api *api ATTRIBUTE_UNUSED)
{
int i;
@ -286,20 +286,20 @@ void warp_shutdown(magic_api * api ATTRIBUTE_UNUSED)
}
}
void warp_set_color(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED,
SDL_Surface * canvas ATTRIBUTE_UNUSED, SDL_Surface * last ATTRIBUTE_UNUSED,
void warp_set_color(magic_api *api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED,
SDL_Surface *canvas ATTRIBUTE_UNUSED, SDL_Surface *last ATTRIBUTE_UNUSED,
Uint8 r ATTRIBUTE_UNUSED, Uint8 g ATTRIBUTE_UNUSED, Uint8 b ATTRIBUTE_UNUSED,
SDL_Rect * update_rect ATTRIBUTE_UNUSED)
SDL_Rect *update_rect ATTRIBUTE_UNUSED)
{
}
int warp_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
int warp_requires_colors(magic_api *api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{
return 0;
}
void warp_switchin(magic_api * api ATTRIBUTE_UNUSED,
int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, SDL_Surface * canvas ATTRIBUTE_UNUSED)
void warp_switchin(magic_api *api ATTRIBUTE_UNUSED,
int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, SDL_Surface *canvas ATTRIBUTE_UNUSED)
{
int x, y;
@ -335,8 +335,8 @@ void warp_switchin(magic_api * api ATTRIBUTE_UNUSED,
}
}
void warp_switchout(magic_api * api ATTRIBUTE_UNUSED,
int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, SDL_Surface * canvas ATTRIBUTE_UNUSED)
void warp_switchout(magic_api *api ATTRIBUTE_UNUSED,
int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, SDL_Surface *canvas ATTRIBUTE_UNUSED)
{
int y;
@ -360,25 +360,25 @@ void warp_switchout(magic_api * api ATTRIBUTE_UNUSED,
}
}
int warp_modes(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
int warp_modes(magic_api *api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{
return (MODE_PAINT);
}
Uint8 warp_accepted_sizes(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
Uint8 warp_accepted_sizes(magic_api *api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{
return NUM_WARP_SIZES;
}
Uint8 warp_default_size(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
Uint8 warp_default_size(magic_api *api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{
return (NUM_WARP_SIZES / 2);
}
void warp_set_size(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED,
SDL_Surface * canvas ATTRIBUTE_UNUSED, SDL_Surface * last ATTRIBUTE_UNUSED, Uint8 size,
SDL_Rect * update_rect ATTRIBUTE_UNUSED)
void warp_set_size(magic_api *api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED,
SDL_Surface *canvas ATTRIBUTE_UNUSED, SDL_Surface *last ATTRIBUTE_UNUSED, Uint8 size,
SDL_Rect *update_rect ATTRIBUTE_UNUSED)
{
warp_radius = (size * MAX_WARP_RADIUS) / NUM_WARP_SIZES;
}