summaryrefslogtreecommitdiff
path: root/lib/libXpm/src/rgb.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libXpm/src/rgb.c')
-rw-r--r--lib/libXpm/src/rgb.c58
1 files changed, 30 insertions, 28 deletions
diff --git a/lib/libXpm/src/rgb.c b/lib/libXpm/src/rgb.c
index 0a5af8b8f..848ae1f11 100644
--- a/lib/libXpm/src/rgb.c
+++ b/lib/libXpm/src/rgb.c
@@ -56,10 +56,9 @@
* number of entries stored.
*/
int
-xpmReadRgbNames(rgb_fname, rgbn)
- char *rgb_fname;
- xpmRgbName rgbn[];
-
+xpmReadRgbNames(
+ char *rgb_fname,
+ xpmRgbName rgbn[])
{
FILE *rgbf;
int n, items, red, green, blue;
@@ -118,11 +117,12 @@ xpmReadRgbNames(rgb_fname, rgbn)
* Return the color name corresponding to the given rgb values
*/
char *
-xpmGetRgbName(rgbn, rgbn_max, red, green, blue)
- xpmRgbName rgbn[]; /* rgb mnemonics from rgb text file */
- int rgbn_max; /* number of rgb mnemonics in table */
- int red, green, blue; /* rgb values */
-
+xpmGetRgbName(
+ xpmRgbName rgbn[], /* rgb mnemonics from rgb text file */
+ int rgbn_max, /* number of rgb mnemonics in table */
+ int red, /* rgb values */
+ int green,
+ int blue)
{
int i;
xpmRgbName *rgb;
@@ -144,10 +144,9 @@ xpmGetRgbName(rgbn, rgbn_max, red, green, blue)
* Free the strings which have been malloc'ed in xpmReadRgbNames
*/
void
-xpmFreeRgbNames(rgbn, rgbn_max)
- xpmRgbName rgbn[];
- int rgbn_max;
-
+xpmFreeRgbNames(
+ xpmRgbName rgbn[],
+ int rgbn_max)
{
int i;
xpmRgbName *rgb;
@@ -162,9 +161,9 @@ xpmFreeRgbNames(rgbn, rgbn_max)
#include "rgbtab.h" /* hard coded rgb.txt table */
int
-xpmReadRgbNames(rgb_fname, rgbn)
- char *rgb_fname;
- xpmRgbName rgbn[];
+xpmReadRgbNames(
+ char *rgb_fname,
+ xpmRgbName rgbn[])
{
/*
* check for consistency???
@@ -178,11 +177,13 @@ xpmReadRgbNames(rgb_fname, rgbn)
* which has something like #0303 for one color
*/
char *
-xpmGetRgbName(rgbn, rgbn_max, red, green, blue)
- xpmRgbName rgbn[]; /* rgb mnemonics from rgb text file
- * not used */
- int rgbn_max; /* not used */
- int red, green, blue; /* rgb values */
+xpmGetRgbName(
+ xpmRgbName rgbn[], /* rgb mnemonics from rgb text file
+ * not used */
+ int rgbn_max, /* not used */
+ int red, /* rgb values */
+ int green,
+ int blue)
{
int i;
@@ -202,9 +203,11 @@ xpmGetRgbName(rgbn, rgbn_max, red, green, blue)
/* used in XParseColor in simx.c */
int
-xpmGetRGBfromName(inname, r, g, b)
- char *inname;
- int *r, *g, *b;
+xpmGetRGBfromName(
+ char *inname,
+ int *r,
+ int *g,
+ int *b)
{
int left, right, middle;
int cmp;
@@ -274,10 +277,9 @@ xpmGetRGBfromName(inname, r, g, b)
}
void
-xpmFreeRgbNames(rgbn, rgbn_max)
- xpmRgbName rgbn[];
- int rgbn_max;
-
+xpmFreeRgbNames(
+ xpmRgbName rgbn[],
+ int rgbn_max)
{
/* nothing to do */
}