mirror
/
XEphem
mirror of https://github.com/XEphem/XEphem.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Replaced empty function definitions with (void)

This commit is contained in:
89391914+robxnano@users.noreply.github.com 2023-04-08 14:56:03 +01:00
parent 54295d38e3
commit 0878ca7fd7
No known key found for this signature in database
GPG Key ID: 9FB6B03B782D1E42
59 changed files with 513 additions and 513 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
GUI/xephem/aavso.c
View File

@ -82,7 +82,7 @@ static char aavsocategory[] = "AAVSO"; /* Save category */
/* create and bring up the AAVSO dialog */ /* create and bring up the AAVSO dialog */
void void
av_manage () av_manage (void)
{ {
if (!av_w) if (!av_w)
av_create(); av_create();
@ -191,7 +191,7 @@ Obj *op;
* return a FILE * else NULL. * return a FILE * else NULL.
*/ */
static FILE * static FILE *
openDB() openDB (void)
{ {
char fn[1024]; char fn[1024];
FILE *fp; FILE *fp;
@ -222,7 +222,7 @@ Cursor c;
/* create the AAVSO shell */ /* create the AAVSO shell */
static void static void
av_create() av_create (void)
{ {
Widget rc_w; Widget rc_w;
Widget fr_w, f_w, w; Widget fr_w, f_w, w;
@ -461,7 +461,7 @@ av_print_cb (Widget w, XtPointer client, XtPointer call)
* call XPSClose() when finished. * call XPSClose() when finished.
*/ */
static void static void
av_print() av_print (void)
{ {
Display *dsp = XtDisplay(toplevel_w); Display *dsp = XtDisplay(toplevel_w);
unsigned int wid, hei, b, d; unsigned int wid, hei, b, d;
@ -660,7 +660,7 @@ char *def;
* return 0 if ok else -1 if trouble. * return 0 if ok else -1 if trouble.
*/ */
static int static int
fetchpm() fetchpm (void)
{ {
static char fmt[] = "GET http://%s%s?%s?%s?%s?%g?%s?%s?%s?%s?%s?%s?%s?XEphem HTTP/1.0\r\nUser-Agent: xephem/%s\r\n\r\n"; static char fmt[] = "GET http://%s%s?%s?%s?%s?%g?%s?%s?%s?%s?%s?%s?%s?XEphem HTTP/1.0\r\nUser-Agent: xephem/%s\r\n\r\n";
Display *dsp = XtDisplay(toplevel_w); Display *dsp = XtDisplay(toplevel_w);
@ -808,7 +808,7 @@ char *line;
/* get the current selection and show its graph */ /* get the current selection and show its graph */
static void static void
fetchAndShow() fetchAndShow (void)
{ {
Display *dsp = XtDisplay(toplevel_w); Display *dsp = XtDisplay(toplevel_w);
Pixmap oldpm; Pixmap oldpm;

10
GUI/xephem/annotmenu.c
View File

@ -80,7 +80,7 @@ static char ano_suffix[] = ".ano"; /* file name suffix */
/* bring up the annotation tool */ /* bring up the annotation tool */
void void
ano_manage() ano_manage (void)
{ {
if (!anoshell_w) { if (!anoshell_w) {
ano_createshell(); ano_createshell();
@ -159,7 +159,7 @@ ano_draw (Widget w, Drawable dr, int convwx(double *ap, double *bp,
* TODO: remove old first * TODO: remove old first
*/ */
void void
ano_newres() ano_newres (void)
{ {
if (!anoshell_w) if (!anoshell_w)
return; return;
@ -184,7 +184,7 @@ Cursor c;
/* create the main annotation shell */ /* create the main annotation shell */
static void static void
ano_createshell() ano_createshell (void)
{ {
Widget w, f_w, pb_w, afs_w, sw_w; Widget w, f_w, pb_w, afs_w, sw_w;
Arg args[20]; Arg args[20];
@ -349,7 +349,7 @@ ano_createshell()
/* add one entry to anorc_w, return index */ /* add one entry to anorc_w, return index */
static int static int
ano_newEntry() ano_newEntry (void)
{ {
Widget d_w, p_w; Widget d_w, p_w;
AnnInfo *ap; AnnInfo *ap;
@ -434,7 +434,7 @@ ano_newEntry()
} }
static void static void
ano_mkgcs() ano_mkgcs (void)
{ {
Display *dsp = XtDisplay (anoshell_w); Display *dsp = XtDisplay (anoshell_w);
Window root = RootWindow(dsp, DefaultScreen(dsp)); Window root = RootWindow(dsp, DefaultScreen(dsp));

4
GUI/xephem/broadcast.c
View File

@ -111,7 +111,7 @@ int how_much;
/* tell everyone who might care that the favorites list has changed. /* tell everyone who might care that the favorites list has changed.
*/ */
void void
all_newfavs() all_newfavs (void)
{ {
/* special prep */ /* special prep */
dm_newfavs(); dm_newfavs();
@ -211,7 +211,7 @@ char *str;
/* return !0 if any of the button/data capture tools are active, else 0. /* return !0 if any of the button/data capture tools are active, else 0.
*/ */
int int
any_ison() any_ison (void)
{ {
return (srch_ison() || plot_ison() || listing_ison()); return (srch_ison() || plot_ison() || listing_ison());
} }

2
GUI/xephem/calmenu.c
View File

@ -247,7 +247,7 @@ Widget parent;
/* called when new resources have been set so we can update fg/bg_pix */ /* called when new resources have been set so we can update fg/bg_pix */
void void
calm_newres() calm_newres (void)
{ {
Widget middle = d_w[CAL_COLS*CAL_ROWS/2]; Widget middle = d_w[CAL_COLS*CAL_ROWS/2];

14
GUI/xephem/closemenu.c
View File

@ -95,7 +95,7 @@ static char closecategory[] = "Close pairs"; /* Save category */
/* bring up Close pairs shell, creating if first time */ /* bring up Close pairs shell, creating if first time */
void void
c_manage() c_manage (void)
{ {
if (!cshell_w) { if (!cshell_w) {
c_create_shell(); c_create_shell();
@ -139,7 +139,7 @@ Cursor c;
/* create a form in a shell to allow user to work with the list. */ /* create a form in a shell to allow user to work with the list. */
static void static void
c_create_shell () c_create_shell (void)
{ {
typedef struct { typedef struct {
char *label; /* what goes on the help label */ char *label; /* what goes on the help label */
@ -509,7 +509,7 @@ c_go_cb (Widget w, XtPointer client, XtPointer call)
* return 0 if ok, else -1. * return 0 if ok, else -1.
*/ */
static int static int
sky_point() sky_point (void)
{ {
String sel; String sel;
char objname[MAXNM]; char objname[MAXNM];
@ -568,7 +568,7 @@ racmp_f (const void *v1, const void *v2)
} }
static void static void
do_search() do_search (void)
{ {
int als = XmToggleButtonGetState(autols_w); int als = XmToggleButtonGetState(autols_w);
double sep; /* desired max separation, rads */ double sep; /* desired max separation, rads */
@ -1068,7 +1068,7 @@ double sep;
/* create the list filename prompt */ /* create the list filename prompt */
static void static void
c_create_flist_w() c_create_flist_w (void)
{ {
Arg args[20]; Arg args[20];
Widget tw; Widget tw;
@ -1126,7 +1126,7 @@ c_flistok_cb (Widget w, XtPointer client, XtPointer call)
/* called when we want to append to a flist file */ /* called when we want to append to a flist file */
static void static void
flistok_append_cb () flistok_append_cb (void)
{ {
char *name; char *name;
@ -1137,7 +1137,7 @@ flistok_append_cb ()
/* called when we want to ceate a new flist file */ /* called when we want to ceate a new flist file */
static void static void
flistok_overwrite_cb () flistok_overwrite_cb (void)
{ {
char *name; char *name;

8
GUI/xephem/compiler.c
View File

@ -176,7 +176,7 @@ char *errbuf;
* reasonable program compiled and able to execute. * reasonable program compiled and able to execute.
*/ */
int int
prog_isgood() prog_isgood (void)
{ {
return (good_prog); return (good_prog);
} }
@ -204,7 +204,7 @@ double value;
* also watch for mismatches parens and proper operator/operand alternation. * also watch for mismatches parens and proper operator/operand alternation.
*/ */
static int static int
next_token () next_token (void)
{ {
static char toomv[] = "More than %d variables"; static char toomv[] = "More than %d variables";
static char toomc[] = "More than %d constants"; static char toomc[] = "More than %d constants";
@ -305,7 +305,7 @@ next_token ()
* if find one, update cexpr too. * if find one, update cexpr too.
*/ */
static int static int
chk_funcs() chk_funcs (void)
{ {
static struct { static struct {
char *st_name; char *st_name;
@ -341,7 +341,7 @@ chk_funcs()
* have to go ahead and crack it! * have to go ahead and crack it!
*/ */
static void static void
skip_double() skip_double (void)
{ {
int sawe = 0; /* so we can allow '-' or '+' right after an 'e' */ int sawe = 0; /* so we can allow '-' or '+' right after an 'e' */

6
GUI/xephem/coordsmenu.c
View File

@ -53,7 +53,7 @@ static char cccategory[] = "Coordinate converter"; /* Save category */
/* bring up the Manual dialog */ /* bring up the Manual dialog */
void void
cc_manage () cc_manage (void)
{ {
if (!ccshell_w) { if (!ccshell_w) {
cc_create(); cc_create();
@ -95,7 +95,7 @@ Cursor c;
/* create the Manual entry dialog */ /* create the Manual entry dialog */
static void static void
cc_create() cc_create (void)
{ {
typedef struct { typedef struct {
char *label; /* label */ char *label; /* label */
@ -410,7 +410,7 @@ int h;
/* tidy up each coordinate display */ /* tidy up each coordinate display */
static void static void
canonAll() canonAll (void)
{ {
block_vchg++; block_vchg++;
reFormat (ccalt_w, 0); reFormat (ccalt_w, 0);

30
GUI/xephem/datamenu.c
View File

@ -165,7 +165,7 @@ static char dscategory[] = "Data Table";
* if never called before, create all the widgets. * if never called before, create all the widgets.
*/ */
void void
dm_manage () dm_manage (void)
{ {
if (!datashell_w) if (!datashell_w)
dm_create_shell(); dm_create_shell();
@ -212,7 +212,7 @@ int how_much;
/* called whenever the favorites list changes */ /* called whenever the favorites list changes */
void void
dm_newfavs() dm_newfavs (void)
{ {
if (!datashell_w) if (!datashell_w)
return; return;
@ -243,7 +243,7 @@ int whether; /* whether setting up for plotting or for not plotting */
/* return the name of the resource containing whether this view is up */ /* return the name of the resource containing whether this view is up */
char * char *
dm_viewupres() dm_viewupres (void)
{ {
return ("DataViewUp"); return ("DataViewUp");
} }
@ -252,7 +252,7 @@ dm_viewupres()
* + means less sky. * + means less sky.
*/ */
static double static double
dm_uhzndep() dm_uhzndep (void)
{ {
char *str = XmTextFieldGetString (hzn_w); char *str = XmTextFieldGetString (hzn_w);
double dis = degrad(atod(str)); double dis = degrad(atod(str));
@ -262,7 +262,7 @@ dm_uhzndep()
/* set text field to hznd */ /* set text field to hznd */
static void static void
dm_resetuhzndep() dm_resetuhzndep (void)
{ {
char buf[32]; char buf[32];
sprintf (buf, "%g", raddeg(hznd)); sprintf (buf, "%g", raddeg(hznd));
@ -366,7 +366,7 @@ char str[];
* the remaining children area recreated each time Favorites changes. * the remaining children area recreated each time Favorites changes.
*/ */
void void
dm_create_shell() dm_create_shell (void)
{ {
Widget ctlrc_w, w; Widget ctlrc_w, w;
Widget mb_w, cb_w, pd_w; Widget mb_w, cb_w, pd_w;
@ -622,7 +622,7 @@ int whether; /* whether setting up for plotting or for not plotting */
* all cols will have the same number of rows. * all cols will have the same number of rows.
*/ */
static void static void
dm_build_cols() dm_build_cols (void)
{ {
int r, c; int r, c;
@ -1147,7 +1147,7 @@ Widget w;
/* setup the limb and centric tag labels according to the current options */ /* setup the limb and centric tag labels according to the current options */
static void static void
dm_settags() dm_settags (void)
{ {
char str[1024], estr[64]; char str[1024], estr[64];
Now *np = mm_get_now(); Now *np = mm_get_now();
@ -1500,7 +1500,7 @@ Widget parent;
* select one that matches sepl_w, if any * select one that matches sepl_w, if any
*/ */
static void static void
ds_buildfsl() ds_buildfsl (void)
{ {
XmString sepstr; XmString sepstr;
int sepfound; int sepfound;
@ -1538,7 +1538,7 @@ ds_buildfsl()
/* set up a Data setup col menu based on what is currently on and defined. /* set up a Data setup col menu based on what is currently on and defined.
*/ */
static void static void
ds_setup_col_selections() ds_setup_col_selections (void)
{ {
int i; int i;
@ -1557,7 +1557,7 @@ ds_setup_col_selections()
* return 0 if all ok, else -1. * return 0 if all ok, else -1.
*/ */
static int static int
ds_apply_selections() ds_apply_selections (void)
{ {
int n_riset; int n_riset;
int n_sep; int n_sep;
@ -1659,7 +1659,7 @@ ds_ctl_cb (Widget w, XtPointer client, XtPointer call)
/* called from the Data selection table Help button /* called from the Data selection table Help button
*/ */
static void static void
ds_help () ds_help (void)
{ {
static char *msg[] = { static char *msg[] = {
"This table lets you configure the rows and columns of the data table." "This table lets you configure the rows and columns of the data table."
@ -1670,7 +1670,7 @@ ds_help ()
/* create the list filename prompt */ /* create the list filename prompt */
static void static void
dm_create_flist_w() dm_create_flist_w (void)
{ {
Arg args[20]; Arg args[20];
int n; int n;
@ -1718,7 +1718,7 @@ dm_flistok_cb (Widget w, XtPointer client, XtPointer call)
/* called when we want to append to a flist file */ /* called when we want to append to a flist file */
static void static void
flistok_append_cb () flistok_append_cb (void)
{ {
char *name; char *name;
@ -1729,7 +1729,7 @@ flistok_append_cb ()
/* called when we want to ceate a new flist file */ /* called when we want to ceate a new flist file */
static void static void
flistok_overwrite_cb () flistok_overwrite_cb (void)
{ {
char *name; char *name;

16
GUI/xephem/db.c
View File

@ -74,7 +74,7 @@ static XtInputId db_fifoid;
/* return number of objects in the database. /* return number of objects in the database.
*/ */
int int
db_n() db_n (void)
{ {
int i, t, n; int i, t, n;
@ -114,7 +114,7 @@ int id;
* support leading ~ and / else assume in ShareDir. * support leading ~ and / else assume in ShareDir.
*/ */
void void
db_loadinitial() db_loadinitial (void)
{ {
char *fns; /* value of DBinitialFiles */ char *fns; /* value of DBinitialFiles */
char *dbicpy; /* local copy of dir */ char *dbicpy; /* local copy of dir */
@ -158,7 +158,7 @@ db_loadinitial()
* new default * new default
*/ */
static void static void
db_setinitial() db_setinitial (void)
{ {
char buf[2048]; char buf[2048];
int i, l; int i, l;
@ -308,7 +308,7 @@ char *name;
/* mark all db objects as out-of-date /* mark all db objects as out-of-date
*/ */
void void
db_invalidate() db_invalidate (void)
{ {
if (!DBINITED) if (!DBINITED)
db_init(); db_init();
@ -416,7 +416,7 @@ Obj *op;
/* reload all loaded catalogs /* reload all loaded catalogs
*/ */
void void
db_rel_all() db_rel_all (void)
{ {
char **curn = NULL; char **curn = NULL;
int i, n; int i, n;
@ -444,7 +444,7 @@ db_rel_all()
/* delete all catalogs except the basic objects. /* delete all catalogs except the basic objects.
*/ */
void void
db_del_all() db_del_all (void)
{ {
int i, n; int i, n;
@ -598,7 +598,7 @@ char *fn;
* we close and reopen each time we are called. * we close and reopen each time we are called.
*/ */
void void
db_connect_fifo() db_connect_fifo (void)
{ {
char fn[1024]; char fn[1024];
@ -668,7 +668,7 @@ db_objadd (DBCat *dbcp, Obj *newop)
/* set up the basic database. /* set up the basic database.
*/ */
static void static void
db_init() db_init (void)
{ {
char buf[256]; char buf[256];
char nm[1][MAXNM]; char nm[1][MAXNM];

12
GUI/xephem/dbmenu.c
View File

@ -49,7 +49,7 @@ static Widget dbt_w; /* T widget for display catalog header */
/* bring up the db menu, creating if first time */ /* bring up the db menu, creating if first time */
void void
db_manage() db_manage (void)
{ {
if (!dbshell_w) if (!dbshell_w)
db_create_shell(); db_create_shell();
@ -139,7 +139,7 @@ Cursor c;
/* return 1 if want to autoload favorite if read a .edb with 1 entry, else 0 */ /* return 1 if want to autoload favorite if read a .edb with 1 entry, else 0 */
int int
db_load1() db_load1 (void)
{ {
/* create if not already */ /* create if not already */
if (!dbshell_w) if (!dbshell_w)
@ -150,7 +150,7 @@ db_load1()
/* create a shell to allow user to manage files . */ /* create a shell to allow user to manage files . */
static void static void
db_create_shell () db_create_shell (void)
{ {
typedef struct { typedef struct {
char *label; /* what goes on the help label */ char *label; /* what goes on the help label */
@ -408,7 +408,7 @@ db_loadpb_cb (Widget w, XtPointer client, XtPointer call)
* N.B. we do not include the planets nor the user objects. * N.B. we do not include the planets nor the user objects.
*/ */
static void static void
db_set_report() db_set_report (void)
{ {
DBScan dbs; DBScan dbs;
char report[1024]; char report[1024];
@ -498,7 +498,7 @@ db_set_report()
} }
static void static void
dbdelall() dbdelall (void)
{ {
db_del_all(); db_del_all();
all_newdb(0); all_newdb(0);
@ -534,7 +534,7 @@ XtPointer data;
} }
static void static void
dbrelall() dbrelall (void)
{ {
watch_cursor(1); watch_cursor(1);
db_rel_all(); db_rel_all();

36
GUI/xephem/earthmenu.c
View File

@ -366,7 +366,7 @@ static unsigned char *neipix; /* malloced exploded nighttime pixel array */
static XColor neixcols[256]; /* nighttime colors */ static XColor neixcols[256]; /* nighttime colors */
void void
e_manage() e_manage (void)
{ {
if (!eshell_w) { if (!eshell_w) {
/* first call: create and init view to main menu's loc. /* first call: create and init view to main menu's loc.
@ -423,7 +423,7 @@ int force;
* rebuild and redraw. * rebuild and redraw.
*/ */
void void
e_newres() e_newres (void)
{ {
if (!eshell_w) if (!eshell_w)
return; return;
@ -432,14 +432,14 @@ e_newres()
} }
int int
e_ison() e_ison (void)
{ {
return (isUp(eshell_w)); return (isUp(eshell_w));
} }
/* called whenever the favorites list changes */ /* called whenever the favorites list changes */
void void
e_newfavs() e_newfavs (void)
{ {
if (!eshell_w) if (!eshell_w)
return; return;
@ -507,7 +507,7 @@ Cursor c;
/* return the name of the resource containing whether this view is up */ /* return the name of the resource containing whether this view is up */
char * char *
e_viewupres() e_viewupres (void)
{ {
return ("EarthViewUp"); return ("EarthViewUp");
} }
@ -516,7 +516,7 @@ e_viewupres()
* the earth stats form is created separately. * the earth stats form is created separately.
*/ */
static void static void
e_create_shell() e_create_shell (void)
{ {
typedef struct { typedef struct {
char *label; /* what goes on the help label */ char *label; /* what goes on the help label */
@ -961,7 +961,7 @@ e_create_shell()
/* make the object control dialog -- real work is in e_buildfavs() */ /* make the object control dialog -- real work is in e_buildfavs() */
static void static void
e_create_ctrl() e_create_ctrl (void)
{ {
Arg args[20]; Arg args[20];
Widget sep_w; Widget sep_w;
@ -1129,7 +1129,7 @@ binsplit (int i)
* preserve existing entries based on same name. * preserve existing entries based on same name.
*/ */
static void static void
e_buildfavs() e_buildfavs (void)
{ {
Arg args[20]; Arg args[20];
Widget w; Widget w;
@ -1719,7 +1719,7 @@ e_print_cb (Widget w, XtPointer client, XtPointer call)
* call XPSClose() when finished. * call XPSClose() when finished.
*/ */
static void static void
e_print () e_print (void)
{ {
Now *np = mm_get_now(); Now *np = mm_get_now();
int w, h, d, wb, hb; int w, h, d, wb, hb;
@ -2412,7 +2412,7 @@ e_proj_cb (Widget w, XtPointer client, XtPointer call)
* return 1 if the size really does change, else 0. * return 1 if the size really does change, else 0.
*/ */
static int static int
e_set_dasize() e_set_dasize (void)
{ {
Dimension nwid = 0, nhei = 0; Dimension nwid = 0, nhei = 0;
Dimension wid, hei; Dimension wid, hei;
@ -2582,7 +2582,7 @@ e_point_cb (Widget w, XtPointer client, XtPointer call)
* we get the color names and save the pixels in the global ecolors[] arrary. * we get the color names and save the pixels in the global ecolors[] arrary.
*/ */
static void static void
e_init_gcs () e_init_gcs (void)
{ {
Display *dsp = XtDisplay (e_da_w); Display *dsp = XtDisplay (e_da_w);
Window win = XtWindow (e_da_w); Window win = XtWindow (e_da_w);
@ -2631,7 +2631,7 @@ e_init_gcs ()
/* copy the pixmap e_pm to the window of e_da_w. */ /* copy the pixmap e_pm to the window of e_da_w. */
static void static void
e_copy_pm() e_copy_pm (void)
{ {
Display *dsp = XtDisplay(e_da_w); Display *dsp = XtDisplay(e_da_w);
Window win = XtWindow(e_da_w); Window win = XtWindow(e_da_w);
@ -2965,7 +2965,7 @@ int x, y;
* save all its widgets in the pu_info struct. * save all its widgets in the pu_info struct.
*/ */
static void static void
e_create_popup() e_create_popup (void)
{ {
Widget w; Widget w;
Arg args[20]; Arg args[20];
@ -3618,7 +3618,7 @@ double *ltp, *lgp; /* resulting lat/long, rads */
/* Turn off track_w in all eobjs */ /* Turn off track_w in all eobjs */
static void static void
noTrack() noTrack (void)
{ {
EObj *eop; EObj *eop;
@ -4801,7 +4801,7 @@ EObj *eop;
* return 0 if ok, else -1 * return 0 if ok, else -1
*/ */
static int static int
e_getwxgif() e_getwxgif (void)
{ {
Display *dsp = XtDisplay(e_da_w); Display *dsp = XtDisplay(e_da_w);
unsigned char rawgif[200000]; unsigned char rawgif[200000];
@ -4999,7 +4999,7 @@ int p;
* return 0 if ok, else -1 * return 0 if ok, else -1
*/ */
static int static int
e_newwxpm() e_newwxpm (void)
{ {
Display *dsp = XtDisplay(e_da_w); Display *dsp = XtDisplay(e_da_w);
Window win = RootWindow(dsp, DefaultScreen(dsp)); Window win = RootWindow(dsp, DefaultScreen(dsp));
@ -5121,7 +5121,7 @@ double *lp, *Lp; /* lat, long, rads, +N, +E */
* return 0 if ok, else write xe_msg and return -1. * return 0 if ok, else write xe_msg and return -1.
*/ */
static int static int
loaddei() loaddei (void)
{ {
struct stat s; struct stat s;
char *rawgif; char *rawgif;
@ -5179,7 +5179,7 @@ loaddei()
* return 0 if ok, else write xe_msg and return -1. * return 0 if ok, else write xe_msg and return -1.
*/ */
static int static int
loadnei() loadnei (void)
{ {
struct stat s; struct stat s;
char *rawgif; char *rawgif;

18
GUI/xephem/favmenu.c
View File

@ -78,7 +78,7 @@ static Obj newo;
/* show, create if first time, the favorites window */ /* show, create if first time, the favorites window */
void void
fav_manage() fav_manage (void)
{ {
if (!favshell_w) if (!favshell_w)
fav_create(); fav_create();
@ -152,7 +152,7 @@ fav_get_loaded (Obj ***oppp)
* goal is to decide whether the copies we have here are now also in the db * goal is to decide whether the copies we have here are now also in the db
*/ */
void void
fav_newdb() fav_newdb (void)
{ {
int i; int i;
@ -210,7 +210,7 @@ fav_cursor (Cursor c)
/* create the favorites window */ /* create the favorites window */
static void static void
fav_create() fav_create (void)
{ {
static struct { static struct {
char *label; char *label;
@ -366,7 +366,7 @@ fav_create()
/* display each of the favs entries in the dialog. */ /* display each of the favs entries in the dialog. */
static void static void
showFavorites() showFavorites (void)
{ {
Widget ww; Widget ww;
Arg args[20]; Arg args[20];
@ -575,7 +575,7 @@ fav_add_cb (Widget w, XtPointer client, XtPointer call)
/* used to delete favorite entry deli */ /* used to delete favorite entry deli */
static void static void
del_i() del_i (void)
{ {
/* remove deli from favs list */ /* remove deli from favs list */
memmove (&favs[deli], &favs[deli+1], (--nfavs-deli)*sizeof(Favorite)); memmove (&favs[deli], &favs[deli+1], (--nfavs-deli)*sizeof(Favorite));
@ -590,7 +590,7 @@ del_i()
/* used to change favorite[deli] to newo */ /* used to change favorite[deli] to newo */
static void static void
chg_i() chg_i (void)
{ {
/* update entry */ /* update entry */
memcpy (&favs[deli].o, &newo, sizeof(Obj)); memcpy (&favs[deli].o, &newo, sizeof(Obj));
@ -680,7 +680,7 @@ fav_del_cb (Widget w, XtPointer client, XtPointer call)
/* add one more to favs and return ponter to new */ /* add one more to favs and return ponter to new */
static Favorite * static Favorite *
favGrow() favGrow (void)
{ {
Favorite *newfp; Favorite *newfp;
@ -691,7 +691,7 @@ favGrow()
} }
static void static void
favRmAll() favRmAll (void)
{ {
XtFree ((char *)favs); XtFree ((char *)favs);
favs = NULL; favs = NULL;
@ -700,7 +700,7 @@ favRmAll()
/* build xfavs, list of Obj* to be exported as the current set of favs */ /* build xfavs, list of Obj* to be exported as the current set of favs */
static void static void
bldExport() bldExport (void)
{ {
int i; int i;

6
GUI/xephem/formats.c
View File

@ -17,19 +17,19 @@
*/ */
static int f_scrnoff; static int f_scrnoff;
void void
f_on () f_on (void)
{ {
f_scrnoff = 0; f_scrnoff = 0;
} }
void void
f_off () f_off (void)
{ {
f_scrnoff = 1; f_scrnoff = 1;
} }
int int
f_ison() f_ison (void)
{ {
return (!f_scrnoff); return (!f_scrnoff);
} }

12
GUI/xephem/fsmenu.c
View File

@ -79,7 +79,7 @@ static char fscategory[] = "Field stars";
/* call to set up without actually bringing up the menus. /* call to set up without actually bringing up the menus.
*/ */
void void
fs_create() fs_create (void)
{ {
if (!fsshell_w) { if (!fsshell_w) {
fs_create_fsshell(); fs_create_fsshell();
@ -88,7 +88,7 @@ fs_create()
} }
void void
fs_manage() fs_manage (void)
{ {
fs_create(); fs_create();
fs_setup(); fs_setup();
@ -251,7 +251,7 @@ ObjF **opp) /* we set *opp to a malloced list of ObjF */
/* return 1 if any proper motion catalog is on enabled, else 0 */ /* return 1 if any proper motion catalog is on enabled, else 0 */
int int
fs_pmon() fs_pmon (void)
{ {
return (ppm_on || tyc_on || ucac_on); return (ppm_on || tyc_on || ucac_on);
} }
@ -423,7 +423,7 @@ scanchk (Obj *mop, double dupsep, double dupmag, Obj *op, double cdec)
} }
static void static void
fs_create_fsshell() fs_create_fsshell (void)
{ {
Widget fsform_w, f, w; Widget fsform_w, f, w;
Widget l_w, rc_w; Widget l_w, rc_w;
@ -848,7 +848,7 @@ fs_create_fsshell()
/* set up the dialog according to our static state */ /* set up the dialog according to our static state */
static void static void
fs_setup () fs_setup (void)
{ {
/* GSC */ /* GSC */
XmToggleButtonSetState (cdtb_w, cd_on, False); XmToggleButtonSetState (cdtb_w, cd_on, False);
@ -892,7 +892,7 @@ fs_setup ()
* if any major trouble, issue xe_msg and return -1, else return 0. * if any major trouble, issue xe_msg and return -1, else return 0.
*/ */
static int static int
fs_save () fs_save (void)
{ {
char msg[1024]; char msg[1024];
int allok = 1; int allok = 1;

14
GUI/xephem/gallerymenu.c
View File

@ -67,7 +67,7 @@ static char galcategory[] = "Image Gallery";
/* bring up the picture menu, creating if first time */ /* bring up the picture menu, creating if first time */
void void
gal_manage() gal_manage (void)
{ {
if (!galshell_w) { if (!galshell_w) {
gal_create_shell(); gal_create_shell();
@ -143,7 +143,7 @@ gal_cursor (Cursor c)
/* create a shell to allow user to manage pictures . */ /* create a shell to allow user to manage pictures . */
static void static void
gal_create_shell () gal_create_shell (void)
{ {
Widget h_w, pw_w; Widget h_w, pw_w;
Widget galform_w; Widget galform_w;
@ -285,7 +285,7 @@ gal_create_shell ()
/* read files and create gallery[] /* read files and create gallery[]
*/ */
static void static void
readCatalogs() readCatalogs (void)
{ {
char buf[1024]; char buf[1024];
char *dir[2]; char *dir[2];
@ -379,7 +379,7 @@ gt_cmp (const void *e1, const void *e2)
/* fill the target selection list from gallery[] which is a list of name elems. /* fill the target selection list from gallery[] which is a list of name elems.
*/ */
static void static void
fillList() fillList (void)
{ {
XmString *xmstrtbl; XmString *xmstrtbl;
int i; int i;
@ -538,7 +538,7 @@ namefind (char *name)
/* reclaim all storage used for the current gallery */ /* reclaim all storage used for the current gallery */
static void static void
galReset() galReset (void)
{ {
if (galroot[0]) { if (galroot[0]) {
delXMLEle (galroot[0]); delXMLEle (galroot[0]);
@ -623,7 +623,7 @@ gal_skypt_cb (Widget w, XtPointer client, XtPointer data)
* if find return ptr, else NULL * if find return ptr, else NULL
*/ */
static Obj * static Obj *
selInDB () selInDB (void)
{ {
DupName *dnp; DupName *dnp;
int ndn = db_dups(&dnp); int ndn = db_dups(&dnp);
@ -643,7 +643,7 @@ selInDB ()
/* return pointer to <name> element of currently selected target, else NULL */ /* return pointer to <name> element of currently selected target, else NULL */
XMLEle * XMLEle *
selGIP () selGIP (void)
{ {
int *pos, npos; int *pos, npos;
XMLEle *nep; XMLEle *nep;

26
GUI/xephem/glance.c
View File

@ -100,7 +100,7 @@ static char naagcategory[] = "Night at a Glance"; /* Save category */
* if first time, build everything, else just get going. * if first time, build everything, else just get going.
*/ */
void void
ng_manage () ng_manage (void)
{ {
if (!ngshell_w) { if (!ngshell_w) {
ng_create_shell(); ng_create_shell();
@ -128,7 +128,7 @@ int how_much;
/* list of favorites has changed */ /* list of favorites has changed */
void void
ng_newfavs() ng_newfavs (void)
{ {
/* only if we're up */ /* only if we're up */
if (!ng_ison()) if (!ng_ison())
@ -140,7 +140,7 @@ ng_newfavs()
* rebuild and redraw. * rebuild and redraw.
*/ */
void void
ng_newres() ng_newres (void)
{ {
if (!ngshell_w) if (!ngshell_w)
return; return;
@ -166,20 +166,20 @@ Cursor c;
/* return the name of the resource containing whether this view is up */ /* return the name of the resource containing whether this view is up */
char * char *
ng_viewupres() ng_viewupres (void)
{ {
return ("NaaGViewUp"); return ("NaaGViewUp");
} }
static int static int
ng_ison() ng_ison (void)
{ {
return (isUp(ngshell_w)); return (isUp(ngshell_w));
} }
static void static void
ng_create_shell() ng_create_shell (void)
{ {
Widget mb_w, pd_w, cb_w, fr_w; Widget mb_w, pd_w, cb_w, fr_w;
Widget ngform_w; Widget ngform_w;
@ -349,7 +349,7 @@ ng_create_shell()
} }
static void static void
ng_create_popup() ng_create_popup (void)
{ {
Arg args[20]; Arg args[20];
Widget w; Widget w;
@ -488,7 +488,7 @@ ng_da_input_cb (Widget w, XtPointer client, XtPointer call)
* call XPSClose() when finished. * call XPSClose() when finished.
*/ */
static void static void
ng_print () ng_print (void)
{ {
/* must be up */ /* must be up */
if (!ng_ison()) { if (!ng_ison()) {
@ -523,7 +523,7 @@ ng_print ()
} }
static void static void
ng_ps_annotate () ng_ps_annotate (void)
{ {
Now *np = mm_get_now(); Now *np = mm_get_now();
char dir[128]; char dir[128];
@ -687,7 +687,7 @@ ng_exp_cb (Widget w, XtPointer client, XtPointer call)
/* redraw the current scene from scratch */ /* redraw the current scene from scratch */
static void static void
ng_redraw() ng_redraw (void)
{ {
ng_drawpm (); ng_drawpm ();
ng_refresh(NULL); ng_refresh(NULL);
@ -730,7 +730,7 @@ XExposeEvent *ep;
* TODO: reclaim old stuff if called again. * TODO: reclaim old stuff if called again.
*/ */
static void static void
ng_init_gcs() ng_init_gcs (void)
{ {
Window win = XtWindow(toplevel_w); Window win = XtWindow(toplevel_w);
Display *dsp = XtD; Display *dsp = XtD;
@ -883,7 +883,7 @@ int *xrp, *xsp;
* N.B. this just fills the pixmap; call ng_refresh() to copy to the screen. * N.B. this just fills the pixmap; call ng_refresh() to copy to the screen.
*/ */
static void static void
ng_drawpm () ng_drawpm (void)
{ {
static char utclabel[] = "UTC"; static char utclabel[] = "UTC";
Now *np = mm_get_now(); Now *np = mm_get_now();
@ -918,7 +918,7 @@ ng_drawpm ()
lmarg = fw * (x > y ? x : y); lmarg = fw * (x > y ? x : y);
/* find graph height sans room for scale and labeling at bottom. /* find graph height sans room for scale and labeling at bottom.
* N.B. this is copied in ng_ano() * N.B. this is copied in ng_ano (void)
*/ */
skyh = ng_h - 4*fh; skyh = ng_h - 4*fh;

4
GUI/xephem/helpmenu.c
View File

@ -102,7 +102,7 @@ int ndeflt; /* number of strings in deflt[] */
} }
void void
hlp_config() hlp_config (void)
{ {
if (!hlp_w) if (!hlp_w)
hlp_create (); hlp_create ();
@ -114,7 +114,7 @@ hlp_config()
/* create the help configuration window (hlp_w). /* create the help configuration window (hlp_w).
*/ */
static void static void
hlp_create () hlp_create (void)
{ {
Widget w, f_w, l_w; Widget w, f_w, l_w;
Arg args[20]; Arg args[20];

4
GUI/xephem/homeio.c
View File

@ -190,7 +190,7 @@ tempfilename (char *buf, char *name, char *suffix)
* use TELHOME env first, else ShareDir X resource, else current dir. * use TELHOME env first, else ShareDir X resource, else current dir.
*/ */
char * char *
getShareDir() getShareDir (void)
{ {
static char *basedir; static char *basedir;
@ -223,7 +223,7 @@ getShareDir()
* I never would have imagined it would be so crazy to turn errno into a string! * I never would have imagined it would be so crazy to turn errno into a string!
*/ */
char * char *
syserrstr () syserrstr (void)
{ {
#if defined(__STDC__) #if defined(__STDC__)
/* some older gcc don't have strerror */ /* some older gcc don't have strerror */

20
GUI/xephem/hznmenu.c
View File

@ -69,7 +69,7 @@ static char hzncategory[] = "Horizon Map"; /* Save category */
#if !defined (TEST_MAIN) #if !defined (TEST_MAIN)
void void
hzn_manage() hzn_manage (void)
{ {
if (!hznshell_w) if (!hznshell_w)
hzn_create(); hzn_create();
@ -78,14 +78,14 @@ hzn_manage()
} }
void void
hzn_unmanage() hzn_unmanage (void)
{ {
if (hznshell_w) if (hznshell_w)
XtUnmanageChild (hznshell_w); XtUnmanageChild (hznshell_w);
} }
int int
hznDrawing() hznDrawing (void)
{ {
if (!hznshell_w) if (!hznshell_w)
hzn_create(); hzn_create();
@ -94,7 +94,7 @@ hznDrawing()
/* call to turn off editing */ /* call to turn off editing */
void void
hznEditingOff() hznEditingOff (void)
{ {
if (XmToggleButtonGetState (edittb_w)) if (XmToggleButtonGetState (edittb_w))
XmToggleButtonSetState (edittb_w, False, True); XmToggleButtonSetState (edittb_w, False, True);
@ -118,7 +118,7 @@ Cursor c;
/* return number of profile entries */ /* return number of profile entries */
int int
hznNProfile() hznNProfile (void)
{ {
if (!hznshell_w) if (!hznshell_w)
hzn_create(); hzn_create();
@ -252,7 +252,7 @@ hznAdd (int start, double newalt, double newaz)
#if !defined (TEST_MAIN) #if !defined (TEST_MAIN)
static void static void
hzn_create() hzn_create (void)
{ {
Widget w, sep_w, om_w; Widget w, sep_w, om_w;
Arg args[20]; Arg args[20];
@ -539,7 +539,7 @@ hzn_chsfn_cb (Widget w, XtPointer client, XtPointer call)
/* get displacement string into displ */ /* get displacement string into displ */
static double static double
hzn_getdispl() hzn_getdispl (void)
{ {
double d; double d;
char *str = XmTextFieldGetString (displtf_w); char *str = XmTextFieldGetString (displtf_w);
@ -587,7 +587,7 @@ int choose_displ;
* return 0 if ok, else -1 * return 0 if ok, else -1
*/ */
static int static int
hzn_rdmap() hzn_rdmap (void)
{ {
char *fn = XmTextFieldGetString (filetf_w); char *fn = XmTextFieldGetString (filetf_w);
FILE *fp; FILE *fp;
@ -628,7 +628,7 @@ hzn_rdmap()
/* fill the profile with a constant elevation model */ /* fill the profile with a constant elevation model */
static void static void
buildCon() buildCon (void)
{ {
double a = hzn_getdispl (); double a = hzn_getdispl ();
@ -646,7 +646,7 @@ buildCon()
* no steps in Alt or Az greater than PSTEP. * no steps in Alt or Az greater than PSTEP.
*/ */
static void static void
smoothProfile() smoothProfile (void)
{ {
Profile *newp; Profile *newp;
double alt0; double alt0;

8
GUI/xephem/imregmenu.c
View File

@ -72,7 +72,7 @@ static void wcsXform (FImage *im, StarPair *s0, StarPair *s1, XForm *xf);
static void doreg(void); static void doreg(void);
void void
ir_manage() ir_manage (void)
{ {
if (!irshell_w) if (!irshell_w)
ir_create(); ir_create();
@ -82,7 +82,7 @@ ir_manage()
/* return whether we are currently looking for a star coord to set a ref star */ /* return whether we are currently looking for a star coord to set a ref star */
int int
ir_setting() ir_setting (void)
{ {
return ((s1_w && XmToggleButtonGetState(s1_w)) return ((s1_w && XmToggleButtonGetState(s1_w))
|| (s1_w && XmToggleButtonGetState(s2_w))); || (s1_w && XmToggleButtonGetState(s2_w)));
@ -165,7 +165,7 @@ Cursor c;
} }
static void static void
ir_create() ir_create (void)
{ {
Widget w, sep_w; Widget w, sep_w;
Arg args[20]; Arg args[20];
@ -468,7 +468,7 @@ wcsXform (FImage *im, StarPair *s0, StarPair *s1, XForm *xf)
/* affect the registration process on the currently displayed image */ /* affect the registration process on the currently displayed image */
static void static void
doreg() doreg (void)
{ {
FImage *s = si_getFImage(); /* image to be registered */ FImage *s = si_getFImage(); /* image to be registered */
FImage new, *d = &new; FImage new, *d = &new;

18
GUI/xephem/indimenu.c
View File

@ -217,7 +217,7 @@ static char indicategory[] = "INDI Panel"; /* Save category */
/* bring up an INDI control panel */ /* bring up an INDI control panel */
void void
indi_manage() indi_manage (void)
{ {
FILE *fp; FILE *fp;
@ -259,7 +259,7 @@ indi_manage()
/* return 0 if currently connected to an INDI server, else -1 /* return 0 if currently connected to an INDI server, else -1
*/ */
int int
indi_connected() indi_connected (void)
{ {
return (svrsocket < 0 ? -1 : 0); return (svrsocket < 0 ? -1 : 0);
} }
@ -356,7 +356,7 @@ indi_getNProperty (char *dev, char *prop)
* only thing we need to do is change the pixmaps in the dev TBs. * only thing we need to do is change the pixmaps in the dev TBs.
*/ */
void void
indi_newres() indi_newres (void)
{ {
/* plagerize from saveres's + and - */ /* plagerize from saveres's + and - */
sr_getDirPM (&opendev_pm, &closedev_pm); sr_getDirPM (&opendev_pm, &closedev_pm);
@ -367,7 +367,7 @@ indi_newres()
/* create the main INDI shell, indi_w and main rc, devrc_w */ /* create the main INDI shell, indi_w and main rc, devrc_w */
void void
indi_createShell () indi_createShell (void)
{ {
Widget w, f_w, mf_w, sw_w, sep_w, pw_w; Widget w, f_w, mf_w, sw_w, sep_w, pw_w;
Arg args[20]; Arg args[20];
@ -546,7 +546,7 @@ indi_createShell ()
* home-made light. * home-made light.
*/ */
static void static void
getLtColors () getLtColors (void)
{ {
Pixel bg_p, fg_p, sel_p; Pixel bg_p, fg_p, sel_p;
Arg args[20]; Arg args[20];
@ -690,7 +690,7 @@ inputCB (XtPointer client, int *fdp, XtInputId *idp)
/* try to contact an INDI server /* try to contact an INDI server
*/ */
static int static int
indi_connect() indi_connect (void)
{ {
char *host, *port; char *host, *port;
char msg[1024]; char msg[1024];
@ -729,7 +729,7 @@ indi_connect()
/* disconnect from INDI server, fine if not already */ /* disconnect from INDI server, fine if not already */
static void static void
indi_disconnect() indi_disconnect (void)
{ {
int i, j; int i, j;
@ -3362,7 +3362,7 @@ numberFormat (char *buf, const char *format, double value)
* some, but still is not perfect. * some, but still is not perfect.
*/ */
static void static void
pushDisplay() pushDisplay (void)
{ {
Dimension w; Dimension w;
@ -3375,7 +3375,7 @@ pushDisplay()
/* print the boilerplate comment introducing xml */ /* print the boilerplate comment introducing xml */
static void static void
xmlv1() xmlv1 (void)
{ {
fprintf (swfp, "<?xml version='1.0'?>\n"); fprintf (swfp, "<?xml version='1.0'?>\n");
} }

22
GUI/xephem/jupmenu.c
View File

@ -162,7 +162,7 @@ static double pole_ra, pole_dec;
* form. otherwise, just get out there and do it! * form. otherwise, just get out there and do it!
*/ */
void void
jm_manage () jm_manage (void)
{ {
if (!jupshell_w) { if (!jupshell_w) {
jm_create_shell_w(); jm_create_shell_w();
@ -245,7 +245,7 @@ int how_much;
* rebuild and redraw. * rebuild and redraw.
*/ */
void void
jm_newres() jm_newres (void)
{ {
if (!jupshell_w) if (!jupshell_w)
return; return;
@ -266,7 +266,7 @@ int appended;
} }
int int
jm_ison() jm_ison (void)
{ {
return (isUp(jupshell_w)); return (isUp(jupshell_w));
} }
@ -324,14 +324,14 @@ Cursor c;
/* return the name of the resource containing whether this view is up */ /* return the name of the resource containing whether this view is up */
char * char *
jm_viewupres() jm_viewupres (void)
{ {
return ("JupViewUp"); return ("JupViewUp");
} }
/* create the main shell */ /* create the main shell */
static void static void
jm_create_shell_w() jm_create_shell_w (void)
{ {
typedef struct { typedef struct {
char *name; /* toggle button instance name, or NULL */ char *name; /* toggle button instance name, or NULL */
@ -645,7 +645,7 @@ jm_create_shell_w()
/* make the statistics form dialog */ /* make the statistics form dialog */
static void static void
jm_create_jsform_w() jm_create_jsform_w (void)
{ {
typedef struct { typedef struct {
int col; /* C* column code */ int col; /* C* column code */
@ -949,7 +949,7 @@ jm_create_jsform_w()
/* create jtform_w, the top view dialog */ /* create jtform_w, the top view dialog */
static void static void
jm_create_tvform_w() jm_create_tvform_w (void)
{ {
Arg args[20]; Arg args[20];
int n; int n;
@ -1159,7 +1159,7 @@ XtPointer call;
* we also try to center it just above, but it doesn't always work. * we also try to center it just above, but it doesn't always work.
*/ */
static void static void
jt_track_size() jt_track_size (void)
{ {
Dimension w, h; Dimension w, h;
Position mfx, mfy, mdx, mdy; Position mfx, mfy, mdx, mdy;
@ -1374,7 +1374,7 @@ jm_da_input_cb (Widget w, XtPointer client, XtPointer call)
/* create the (unmanaged for now) popup menu in jmpu_w. */ /* create the (unmanaged for now) popup menu in jmpu_w. */
static void static void
jm_create_popup() jm_create_popup (void)
{ {
static Widget *puw[] = { static Widget *puw[] = {
&jmpu_name_w, &jmpu_name_w,
@ -1556,7 +1556,7 @@ jm_print_cb (Widget w, XtPointer client, XtPointer call)
* call XPSClose() when finished. * call XPSClose() when finished.
*/ */
static void static void
jm_print () jm_print (void)
{ {
Display *dsp = XtDisplay (jda_w); Display *dsp = XtDisplay (jda_w);
Now *np = mm_get_now(); Now *np = mm_get_now();
@ -2336,7 +2336,7 @@ jt_ano (double *jX, double *jZ, int *xp, int *yp, int w2x, int arg)
* TODO: reclaim old stuff if called again. * TODO: reclaim old stuff if called again.
*/ */
static void static void
make_gcs () make_gcs (void)
{ {
Display *dsp = XtDisplay(toplevel_w); Display *dsp = XtDisplay(toplevel_w);
Window win = XtWindow(toplevel_w); Window win = XtWindow(toplevel_w);

24
GUI/xephem/listmenu.c
View File

@ -89,7 +89,7 @@ static char xml_listele[] = "XEphemListConfig";
* form. otherwise, go for it. * form. otherwise, go for it.
*/ */
void void
lst_manage () lst_manage (void)
{ {
if (!lstshell_w) if (!lstshell_w)
lst_create_shell(); lst_create_shell();
@ -133,7 +133,7 @@ char *str;
* write the active listing to the current listing file, if one is open. * write the active listing to the current listing file, if one is open.
*/ */
void void
listing() listing (void)
{ {
if (lst_fp) { if (lst_fp) {
/* list in order of original selection */ /* list in order of original selection */
@ -159,7 +159,7 @@ listing()
} }
int int
listing_ison() listing_ison (void)
{ {
return (lst_fp != 0); return (lst_fp != 0);
} }
@ -191,7 +191,7 @@ int whether;
} }
static void static void
lst_create_shell() lst_create_shell (void)
{ {
typedef struct { typedef struct {
int indent; /* amount to indent, pixels */ int indent; /* amount to indent, pixels */
@ -604,7 +604,7 @@ lst_undo_cb (Widget w, XtPointer client, XtPointer call)
/* forget the list, and unmanage the table. /* forget the list, and unmanage the table.
*/ */
static void static void
lst_reset() lst_reset (void)
{ {
int i; int i;
@ -636,7 +636,7 @@ lst_add (char *name)
* is off. * is off.
*/ */
static void static void
lst_stop_selecting() lst_stop_selecting (void)
{ {
XmToggleButtonSetState (select_w, False, False); XmToggleButtonSetState (select_w, False, False);
lst_select(0); lst_select(0);
@ -645,7 +645,7 @@ lst_stop_selecting()
} }
static void static void
lst_turn_off () lst_turn_off (void)
{ {
if (lst_fp) { if (lst_fp) {
(void) fclose (lst_fp); (void) fclose (lst_fp);
@ -655,7 +655,7 @@ lst_turn_off ()
/* called from the query routine when want to append to an existing list file.*/ /* called from the query routine when want to append to an existing list file.*/
static void static void
lst_try_append() lst_try_append (void)
{ {
lst_turn_on("a"); lst_turn_on("a");
} }
@ -664,14 +664,14 @@ lst_try_append()
* file. * file.
*/ */
static void static void
lst_try_overwrite() lst_try_overwrite (void)
{ {
lst_turn_on("w"); lst_turn_on("w");
} }
/* called from the query routine when decided not to make a listing file. */ /* called from the query routine when decided not to make a listing file. */
static void static void
lst_try_cancel() lst_try_cancel (void)
{ {
XmToggleButtonSetState (active_w, False, False); XmToggleButtonSetState (active_w, False, False);
} }
@ -681,7 +681,7 @@ lst_try_cancel()
* but if it does, first ask wheher to append or overwrite. * but if it does, first ask wheher to append or overwrite.
*/ */
static void static void
lst_try_turn_on() lst_try_turn_on (void)
{ {
char *txt = XmTextFieldGetString (filename_w); char *txt = XmTextFieldGetString (filename_w);
char pn[1024]; char pn[1024];
@ -728,7 +728,7 @@ char *how; /* fopen how argument */
* else just use l_str. * else just use l_str.
*/ */
static void static void
lst_hdr () lst_hdr (void)
{ {
LstFld *lp; LstFld *lp;
int col; int col;

46
GUI/xephem/mainmenu.c
View File

@ -417,14 +417,14 @@ Widget mainrc;
/* connect up an action routine to handle XeUpdate */ /* connect up an action routine to handle XeUpdate */
void void
mm_connActions() mm_connActions (void)
{ {
XtAppAddActions (xe_app, mm_actions, XtNumber(mm_actions)); XtAppAddActions (xe_app, mm_actions, XtNumber(mm_actions));
} }
/* called to update after new resources are installed */ /* called to update after new resources are installed */
void void
mm_newres() mm_newres (void)
{ {
Pixel p; Pixel p;
@ -445,7 +445,7 @@ mm_newres()
* or stops if currently doing that. * or stops if currently doing that.
*/ */
void void
mm_external () mm_external (void)
{ {
if (ext_fp) if (ext_fp)
mm_stop(); mm_stop();
@ -583,7 +583,7 @@ int update;
* N.B. caller should not change anything. * N.B. caller should not change anything.
*/ */
char * char *
mm_getsite () mm_getsite (void)
{ {
return (msitename); return (msitename);
} }
@ -617,7 +617,7 @@ Now *np;
/* a way for anyone to know what now is */ /* a way for anyone to know what now is */
Now * Now *
mm_get_now() mm_get_now (void)
{ {
return (&now); return (&now);
} }
@ -718,14 +718,14 @@ int how_much;
/* name of resource containg whether to start running in real time */ /* name of resource containg whether to start running in real time */
char * char *
mm_autortres() mm_autortres (void)
{ {
return ("AutoRT"); return ("AutoRT");
} }
/* keep XEphem time in sync with computer */ /* keep XEphem time in sync with computer */
void void
mm_startrt() mm_startrt (void)
{ {
/* RT Clock stepping */ /* RT Clock stepping */
set_t0 (&now); set_t0 (&now);
@ -753,7 +753,7 @@ mm_startrt()
* N.B. we use the colors from status_w. * N.B. we use the colors from status_w.
*/ */
static void static void
create_pixmaps() create_pixmaps (void)
{ {
Display *dsp = XtDisplay (toplevel_w); Display *dsp = XtDisplay (toplevel_w);
Window win = RootWindow (dsp, DefaultScreen(dsp)); Window win = RootWindow (dsp, DefaultScreen(dsp));
@ -1233,7 +1233,7 @@ keepnow_cb (Widget w, XtPointer client, XtPointer call)
/* set things to their initial resource settings */ /* set things to their initial resource settings */
static void static void
mm_initres() mm_initres (void)
{ {
/* list of FIDs we get from resources, in order */ /* list of FIDs we get from resources, in order */
typedef struct { typedef struct {
@ -1334,7 +1334,7 @@ XtIntervalId *id;
/* stop running */ /* stop running */
static void static void
mm_stop() mm_stop (void)
{ {
/* close external file if in use */ /* close external file if in use */
ext_stop(); ext_stop();
@ -1749,7 +1749,7 @@ int reverse;
} }
static void static void
print_magdecl() print_magdecl (void)
{ {
static int lasts = -100; static int lasts = -100;
double yr, md; double yr, md;
@ -1770,7 +1770,7 @@ print_magdecl()
} }
static void static void
print_tminc() print_tminc (void)
{ {
Widget stpsz_w = fw(STPSZ_FID); Widget stpsz_w = fw(STPSZ_FID);
StepCode stepcode= mm_step_option ? mm_step_option->stepcode : FIXED_SS; StepCode stepcode= mm_step_option ? mm_step_option->stepcode : FIXED_SS;
@ -1807,13 +1807,13 @@ print_tminc()
} }
static void static void
print_updating() print_updating (void)
{ {
print_status ("Updating..."); print_status ("Updating...");
} }
static void static void
print_idle() print_idle (void)
{ {
print_status ("Make changes then press Update to run."); print_status ("Make changes then press Update to run.");
f_string (go_w, "Update"); f_string (go_w, "Update");
@ -1831,7 +1831,7 @@ int reverse;
} }
static void static void
print_extrunning() print_extrunning (void)
{ {
print_status ("External control ... press Stop to stop."); print_status ("External control ... press Stop to stop.");
f_string (go_w, "Stop"); f_string (go_w, "Stop");
@ -1851,7 +1851,7 @@ char *s;
} }
static void static void
print_nstep() print_nstep (void)
{ {
static int last = 876476; static int last = 876476;
@ -1864,7 +1864,7 @@ print_nstep()
} }
static void static void
print_mspause() print_mspause (void)
{ {
static int last = 98764; static int last = 98764;
@ -2373,7 +2373,7 @@ char *bp;
/* draw the various marker pixmaps */ /* draw the various marker pixmaps */
static void static void
mm_pms() mm_pms (void)
{ {
Obj *op; Obj *op;
Pixmap moonpm; Pixmap moonpm;
@ -2471,7 +2471,7 @@ int all;
*/ */
/* ARGSUSED */ /* ARGSUSED */
static void static void
mm_twilight () mm_twilight (void)
{ {
static char nope[] = "-----"; static char nope[] = "-----";
double dusk, dawn; double dusk, dawn;
@ -2588,7 +2588,7 @@ XtIntervalId *id;
/* ask for name of file to read for external input */ /* ask for name of file to read for external input */
static void static void
ext_fileask() ext_fileask (void)
{ {
if (!ext_w) if (!ext_w)
ext_create_w(); ext_create_w();
@ -2597,7 +2597,7 @@ ext_fileask()
/* create the external file input name prompt */ /* create the external file input name prompt */
static void static void
ext_create_w() ext_create_w (void)
{ {
Arg args[20]; Arg args[20];
Widget t_w; Widget t_w;
@ -2624,7 +2624,7 @@ ext_create_w()
* if can't find any entries, return -1 with ext_fp definitely closed. * if can't find any entries, return -1 with ext_fp definitely closed.
*/ */
static int static int
ext_readnext() ext_readnext (void)
{ {
double rjd, rlat, rlng; double rjd, rlat, rlng;
char buf[1024]; char buf[1024];
@ -2690,7 +2690,7 @@ ext_ok_cb (Widget w, XtPointer client, XtPointer call)
/* stop using an external file, if any */ /* stop using an external file, if any */
static void static void
ext_stop() ext_stop (void)
{ {
if (ext_fp) { if (ext_fp) {
fclose (ext_fp); fclose (ext_fp);

48
GUI/xephem/marsmenu.c
View File

@ -218,7 +218,7 @@ static int nmf; /* entries in mf[] */
* allow for retrying to read the image file each time until find it. * allow for retrying to read the image file each time until find it.
*/ */
void void
mars_manage () mars_manage (void)
{ {
if (!mshell_w) { if (!mshell_w) {
/* one-time-only work */ /* one-time-only work */
@ -273,7 +273,7 @@ int how_much;
* rebuild and redraw. * rebuild and redraw.
*/ */
void void
mars_newres() mars_newres (void)
{ {
marsm_newres(); marsm_newres();
if (!mshell_w) if (!mshell_w)
@ -283,7 +283,7 @@ mars_newres()
} }
int int
mars_ison() mars_ison (void)
{ {
return (isUp(mshell_w)); return (isUp(mshell_w));
} }
@ -342,13 +342,13 @@ Cursor c;
/* return the name of the resource containing whether this view is up */ /* return the name of the resource containing whether this view is up */
char * char *
mars_viewupres() mars_viewupres (void)
{ {
return ("MarsViewUp"); return ("MarsViewUp");
} }
static void static void
m_create_shell() m_create_shell (void)
{ {
typedef struct { typedef struct {
Option o; /* which option */ Option o; /* which option */
@ -615,7 +615,7 @@ m_create_shell()
/* create the "more info" stats dialog */ /* create the "more info" stats dialog */
static void static void
m_create_msform() m_create_msform (void)
{ {
typedef struct { typedef struct {
char *label; char *label;
@ -932,7 +932,7 @@ mfsa_qsort (const void *p1, const void *p2)
* N.B. we assume mfsa[] and mf[] are all set up. * N.B. we assume mfsa[] and mf[] are all set up.
*/ */
static void static void
m_create_mfform() m_create_mfform (void)
{ {
typedef struct { typedef struct {
MFCtrl mfce; /* which feature control */ MFCtrl mfce; /* which feature control */
@ -1212,7 +1212,7 @@ m_print_cb (Widget w, XtPointer client, XtPointer call)
* call XPSClose() when finished. * call XPSClose() when finished.
*/ */
static void static void
m_print () m_print (void)
{ {
/* must be up */ /* must be up */
if (!mars_ison()) { if (!mars_ison()) {
@ -1242,7 +1242,7 @@ m_print ()
} }
static void static void
m_ps_annotate () m_ps_annotate (void)
{ {
Now *np = mm_get_now(); Now *np = mm_get_now();
char dir[128]; char dir[128];
@ -1509,7 +1509,7 @@ m_option_cb (Widget w, XtPointer client, XtPointer call)
* this is used to keep mountains looking like mountains when flipping t/b * this is used to keep mountains looking like mountains when flipping t/b
*/ */
static void static void
swap_colors() swap_colors (void)
{ {
int i; int i;
@ -1545,7 +1545,7 @@ m_helpon_cb (Widget w, XtPointer client, XtPointer call)
/* set winsz from HALFSIZ_OPT then size of the scrolling window, image and pm.*/ /* set winsz from HALFSIZ_OPT then size of the scrolling window, image and pm.*/
static void static void
m_setsize() m_setsize (void)
{ {
Window win = RootWindow(XtD, DefaultScreen(XtD)); Window win = RootWindow(XtD, DefaultScreen(XtD));
Dimension wid, hei; Dimension wid, hei;
@ -1844,7 +1844,7 @@ Boolean *continue_to_dispatch;
/* establish mimage and m_xim and return 0 else xe_msg() and return -1 */ /* establish mimage and m_xim and return 0 else xe_msg() and return -1 */
static int static int
m_readmap() m_readmap (void)
{ {
unsigned char r[256], g[256], b[256]; unsigned char r[256], g[256], b[256];
char why[256]; char why[256];
@ -1892,7 +1892,7 @@ m_readmap()
* return 0 if ok else -1 and xe_msg(). * return 0 if ok else -1 and xe_msg().
*/ */
static int static int
mxim_create () mxim_create (void)
{ {
Display *dsp = XtDisplay (mda_w); Display *dsp = XtDisplay (mda_w);
int nbytes = winsz*winsz*mbpp/8; int nbytes = winsz*winsz*mbpp/8;
@ -1940,7 +1940,7 @@ mxim_create ()
* from the current list of chosen types. * from the current list of chosen types.
*/ */
static void static void
m_setselected() m_setselected (void)
{ {
int i; int i;
@ -2007,7 +2007,7 @@ XExposeEvent *ep;
* TODO: reclaim old stuff if called again * TODO: reclaim old stuff if called again
*/ */
static void static void
m_init_gcs() m_init_gcs (void)
{ {
Display *dsp = XtD; Display *dsp = XtD;
Window win = XtWindow(toplevel_w); Window win = XtWindow(toplevel_w);
@ -2063,7 +2063,7 @@ m_init_gcs()
/* update mars info and draw the stat labels */ /* update mars info and draw the stat labels */
static void static void
m_stats () m_stats (void)
{ {
Now *np = mm_get_now(); Now *np = mm_get_now();
@ -2098,7 +2098,7 @@ m_stats ()
* N.B. if want to draw, call m_refresh() after this. * N.B. if want to draw, call m_refresh() after this.
*/ */
static void static void
m_drawpm () m_drawpm (void)
{ {
/* check assumptions */ /* check assumptions */
if (!m_pm) { if (!m_pm) {
@ -2205,7 +2205,7 @@ mf_qsort (const void *p1, const void *p2)
* return 0 if ok, else -1. * return 0 if ok, else -1.
*/ */
static int static int
m_readFeatures() m_readFeatures (void)
{ {
char buf[1024]; char buf[1024];
char fn[1024]; char fn[1024];
@ -2270,7 +2270,7 @@ m_readFeatures()
/* draw the mf list, based on what is selected in flist_w */ /* draw the mf list, based on what is selected in flist_w */
static void static void
m_drFeatures () m_drFeatures (void)
{ {
Display *dsp = XtDisplay (mda_w); Display *dsp = XtDisplay (mda_w);
int *selected, nselected; int *selected, nselected;
@ -2316,7 +2316,7 @@ m_drFeatures ()
/* draw the N/S E/W labels on m_pm */ /* draw the N/S E/W labels on m_pm */
static void static void
m_orientation() m_orientation (void)
{ {
Now *np = mm_get_now(); Now *np = mm_get_now();
double mr, mra, mdec; double mr, mra, mdec;
@ -2361,7 +2361,7 @@ m_orientation()
/* draw the size calibration */ /* draw the size calibration */
static void static void
m_sizecal() m_sizecal (void)
{ {
int dir, asc, des; int dir, asc, des;
XCharStruct xcs; XCharStruct xcs;
@ -2385,7 +2385,7 @@ m_sizecal()
/* draw a coordinate grid over the image already on m_pm */ /* draw a coordinate grid over the image already on m_pm */
static void static void
m_grid() m_grid (void)
{ {
Display *dsp = XtDisplay (mda_w); Display *dsp = XtDisplay (mda_w);
double fsp = FSP; double fsp = FSP;
@ -2462,7 +2462,7 @@ m_grid()
* m_xim is winszxwinsz, mimage is 2*IMH wide x IMH high. * m_xim is winszxwinsz, mimage is 2*IMH wide x IMH high.
*/ */
static void static void
mxim_setup () mxim_setup (void)
{ {
#define SQR(x) ((x)*(x)) #define SQR(x) ((x)*(x))
int pixseeing = (int)(winsz*m_seeing/marsop->s_size/10); int pixseeing = (int)(winsz*m_seeing/marsop->s_size/10);
@ -2806,7 +2806,7 @@ XEvent *ep;
/* create the surface popup menu */ /* create the surface popup menu */
static void static void
m_create_popup() m_create_popup (void)
{ {
Widget w; Widget w;
Arg args[20]; Arg args[20];

18
GUI/xephem/marsmmenu.c
View File

@ -152,7 +152,7 @@ static double pole_ra, pole_dec;
* form. otherwise, just insure up. * form. otherwise, just insure up.
*/ */
void void
marsm_manage () marsm_manage (void)
{ {
if (!mmshell_w) { if (!mmshell_w) {
marsm_create_shell_w(); marsm_create_shell_w();
@ -227,7 +227,7 @@ int how_much;
* rebuild and redraw. * rebuild and redraw.
*/ */
void void
marsm_newres() marsm_newres (void)
{ {
if (!mmshell_w) if (!mmshell_w)
return; return;
@ -248,7 +248,7 @@ int appended;
} }
int int
marsm_ison() marsm_ison (void)
{ {
return (isUp(mmshell_w)); return (isUp(mmshell_w));
} }
@ -306,7 +306,7 @@ Cursor c;
/* create the main moons shell */ /* create the main moons shell */
static void static void
marsm_create_shell_w() marsm_create_shell_w (void)
{ {
typedef struct { typedef struct {
char *name; /* toggle button instance name, or NULL */ char *name; /* toggle button instance name, or NULL */
@ -620,7 +620,7 @@ marsm_create_shell_w()
/* make the statistics form dialog */ /* make the statistics form dialog */
static void static void
marsm_create_msform_w() marsm_create_msform_w (void)
{ {
typedef struct { typedef struct {
int col; /* C* column code */ int col; /* C* column code */
@ -839,7 +839,7 @@ marsm_create_msform_w()
/* create mtform_w, the top view dialog */ /* create mtform_w, the top view dialog */
static void static void
marsm_create_tvform_w() marsm_create_tvform_w (void)
{ {
Arg args[20]; Arg args[20];
int n; int n;
@ -1037,7 +1037,7 @@ XtPointer call;
* we also try to center it just above, but it doesn't always work. * we also try to center it just above, but it doesn't always work.
*/ */
static void static void
mt_track_size() mt_track_size (void)
{ {
Dimension w, h; Dimension w, h;
Position mfx, mfy, mdx, mdy; Position mfx, mfy, mdx, mdy;
@ -1241,7 +1241,7 @@ marsm_da_input_cb (Widget w, XtPointer client, XtPointer call)
/* create the (unmanaged for now) popup menu in mmpu_w. */ /* create the (unmanaged for now) popup menu in mmpu_w. */
static void static void
marsm_create_popup() marsm_create_popup (void)
{ {
static Widget *puw[] = { static Widget *puw[] = {
&mmpu_name_w, &mmpu_name_w,
@ -1422,7 +1422,7 @@ marsm_print_cb (Widget w, XtPointer client, XtPointer call)
* call XPSClose() when finished. * call XPSClose() when finished.
*/ */
static void static void
marsm_print () marsm_print (void)
{ {
Display *dsp = XtDisplay (mda_w); Display *dsp = XtDisplay (mda_w);
Now *np = mm_get_now(); Now *np = mm_get_now();

76
GUI/xephem/moonmenu.c
View File

@ -285,7 +285,7 @@ static MoonDB *closeMoonDB (int x, int y);
* allow for retrying to read the image file each time until find it. * allow for retrying to read the image file each time until find it.
*/ */
void void
m_manage () m_manage (void)
{ {
if (!mshell_w) { if (!mshell_w) {
/* menu one-time-only work */ /* menu one-time-only work */
@ -322,7 +322,7 @@ m_manage ()
} }
int int
m_ison() m_ison (void)
{ {
return (isUp(mshell_w)); return (isUp(mshell_w));
} }
@ -347,7 +347,7 @@ int how_much;
* rebuild and redraw. * rebuild and redraw.
*/ */
void void
m_newres() m_newres (void)
{ {
if (!mshell_w) if (!mshell_w)
return; return;
@ -423,13 +423,13 @@ Cursor c;
/* return the name of the resource containing whether this view is up */ /* return the name of the resource containing whether this view is up */
char * char *
m_viewupres() m_viewupres (void)
{ {
return ("MoonViewUp"); return ("MoonViewUp");
} }
static void static void
m_create_shell() m_create_shell (void)
{ {
typedef struct { typedef struct {
Option o; /* which option */ Option o; /* which option */
@ -784,7 +784,7 @@ m_create_shell()
} }
static void static void
m_create_msform() m_create_msform (void)
{ {
typedef struct { typedef struct {
int islabel; int islabel;
@ -1076,7 +1076,7 @@ m_create_msform()
/* create the little earthshine scale factor dialog */ /* create the little earthshine scale factor dialog */
static void static void
m_create_esform() m_create_esform (void)
{ {
Arg args[20]; Arg args[20];
Widget sep_w; Widget sep_w;
@ -1260,7 +1260,7 @@ m_print_cb (Widget w, XtPointer client, XtPointer call)
* call XPSClose() when finished. * call XPSClose() when finished.
*/ */
static void static void
m_print () m_print (void)
{ {
/* must be up */ /* must be up */
if (!m_ison()) { if (!m_ison()) {
@ -1291,7 +1291,7 @@ m_print ()
} }
static void static void
m_ps_annotate () m_ps_annotate (void)
{ {
Now *np = mm_get_now(); Now *np = mm_get_now();
char dir[128]; char dir[128];
@ -1761,7 +1761,7 @@ m_exp_cb (Widget w, XtPointer client, XtPointer call)
/* redraw the current scene */ /* redraw the current scene */
static void static void
m_redraw() m_redraw (void)
{ {
watch_cursor (1); watch_cursor (1);
@ -1820,7 +1820,7 @@ unsigned *wp, *hp, *dp;
* TODO: reclaim old stuff if called again. * TODO: reclaim old stuff if called again.
*/ */
static void static void
m_init_gcs() m_init_gcs (void)
{ {
Display *dsp = XtD; Display *dsp = XtD;
Window win = XtWindow(toplevel_w); Window win = XtWindow(toplevel_w);
@ -1903,7 +1903,7 @@ Now *np;
* then, if m_pm is defined, compute a scene onto it. * then, if m_pm is defined, compute a scene onto it.
*/ */
static void static void
m_draw () m_draw (void)
{ {
Now *np = mm_get_now(); Now *np = mm_get_now();
@ -1923,7 +1923,7 @@ m_draw ()
* N.B. this just fills the pixmap; call m_refresh() to copy to the screen. * N.B. this just fills the pixmap; call m_refresh() to copy to the screen.
*/ */
static void static void
mi_draw () mi_draw (void)
{ {
XGCValues gcv; XGCValues gcv;
unsigned int gcm; unsigned int gcm;
@ -2016,7 +2016,7 @@ m_ano (double *fracx, double *fracy, int *xp, int *yp, int w2x, int arg)
/* label the database entries marked for name display */ /* label the database entries marked for name display */
static void static void
m_labels() m_labels (void)
{ {
MoonDB *mp; MoonDB *mp;
@ -2039,7 +2039,7 @@ m_labels()
/* add background sky objects to m_pm and to skyobjs[] list */ /* add background sky objects to m_pm and to skyobjs[] list */
static void static void
m_sky() m_sky (void)
{ {
static int before; static int before;
Now *np = mm_get_now(); Now *np = mm_get_now();
@ -2187,7 +2187,7 @@ MoonDB *mp;
* we are showing lunar coords. * we are showing lunar coords.
*/ */
static void static void
m_orientation() m_orientation (void)
{ {
int fw, fa, fd; int fw, fa, fd;
int dir, asc, des; int dir, asc, des;
@ -2211,7 +2211,7 @@ m_orientation()
/* draw a coordinate grid over the image moon on m_pm */ /* draw a coordinate grid over the image moon on m_pm */
static void static void
m_grid() m_grid (void)
{ {
#define GSP degrad(15.0) /* grid spacing */ #define GSP degrad(15.0) /* grid spacing */
#define FSP (GSP/4.) /* fine spacing */ #define FSP (GSP/4.) /* fine spacing */
@ -2261,7 +2261,7 @@ m_grid()
/* draw an X at the subearth and a circle at the subsolar spot using minfo */ /* draw an X at the subearth and a circle at the subsolar spot using minfo */
static void static void
m_sub () m_sub (void)
{ {
#define SUBR 4 #define SUBR 4
Display *dsp = XtDisplay (mda_w); Display *dsp = XtDisplay (mda_w);
@ -2296,7 +2296,7 @@ m_sub ()
* return 0 if ok else -1 and xe_msg(). * return 0 if ok else -1 and xe_msg().
*/ */
static int static int
mxim_create () mxim_create (void)
{ {
Display *dsp = XtDisplay (mda_w); Display *dsp = XtDisplay (mda_w);
int nbytes = (mnrows+7)*(mncols+7)*mbpp/8; int nbytes = (mnrows+7)*(mncols+7)*mbpp/8;
@ -2336,7 +2336,7 @@ mxim_create ()
* earthshine. * earthshine.
*/ */
static void static void
image_setup () image_setup (void)
{ {
double esrlng = minfo.srlng-CLNG; /* correct for earth viewpoint */ double esrlng = minfo.srlng-CLNG; /* correct for earth viewpoint */
int right = cos(esrlng) < 0; /*whther shadw reaches to right limb*/ int right = cos(esrlng) < 0; /*whther shadw reaches to right limb*/
@ -2430,7 +2430,7 @@ int *lxp, *rxp; /* left and right x of edges of earthshine */
/* create a clipping mask for applying m_xim to m_pm */ /* create a clipping mask for applying m_xim to m_pm */
static void static void
m_clip_mask_setup () m_clip_mask_setup (void)
{ {
if (!m_clip_mask) if (!m_clip_mask)
{ {
@ -2468,7 +2468,7 @@ m_clip_mask_setup ()
/* delete clipping mask so new one will get built when needed */ /* delete clipping mask so new one will get built when needed */
static void static void
m_free_clip_mask () m_free_clip_mask (void)
{ {
if (m_clip_mask) { if (m_clip_mask) {
XFreePixmap (XtD, m_clip_mask); XFreePixmap (XtD, m_clip_mask);
@ -2478,7 +2478,7 @@ m_free_clip_mask ()
/* go through database and set screen loc given lat/long */ /* go through database and set screen loc given lat/long */
static void static void
m_dbloc() m_dbloc (void)
{ {
MoonDB *mp; MoonDB *mp;
@ -2625,7 +2625,7 @@ int f;
/* set size of mda_w as desired based on mnrows and mncols */ /* set size of mda_w as desired based on mnrows and mncols */
static void static void
m_sizewidgets () m_sizewidgets (void)
{ {
int neww = mncols + 2*BORD; int neww = mncols + 2*BORD;
int newh = mnrows + 2*BORD; int newh = mnrows + 2*BORD;
@ -2662,7 +2662,7 @@ int f;
* form 2x2 tiles whose pattern depends on intensity peak and spacial layout. * form 2x2 tiles whose pattern depends on intensity peak and spacial layout.
*/ */
static void static void
mBWdither() mBWdither (void)
{ {
int idx[4]; int idx[4];
int y; int y;
@ -2716,7 +2716,7 @@ mBWdither()
/* draw umbra and penumbra boundaries */ /* draw umbra and penumbra boundaries */
static void static void
m_umbra() m_umbra (void)
{ {
Now *np = mm_get_now(); Now *np = mm_get_now();
Obj *mop = db_basic (MOON); Obj *mop = db_basic (MOON);
@ -2777,7 +2777,7 @@ m_umbra()
/* flip mimage left/right */ /* flip mimage left/right */
static void static void
fliplr() fliplr (void)
{ {
int x, y; int x, y;
@ -2795,7 +2795,7 @@ fliplr()
* N.B. will flip back option if can't do it for some reason. * N.B. will flip back option if can't do it for some reason.
*/ */
static void static void
fliptb() fliptb (void)
{ {
char buf[2048]; /* plenty :-) */ char buf[2048]; /* plenty :-) */
int y; int y;
@ -2821,7 +2821,7 @@ fliptb()
/* draw a marker on m_pm to show the limb angle favored by libration */ /* draw a marker on m_pm to show the limb angle favored by libration */
static void static void
m_mark_libr () m_mark_libr (void)
{ {
int r; /* radius of marker */ int r; /* radius of marker */
int x, y; /* center of marker */ int x, y; /* center of marker */
@ -2873,7 +2873,7 @@ int x, y;
/* print minfo */ /* print minfo */
static void static void
m_pinfo() m_pinfo (void)
{ {
f_dm_angle (lat_w, minfo.curlt); f_dm_angle (lat_w, minfo.curlt);
f_dm_angle (lng_w, minfo.curlg); f_dm_angle (lng_w, minfo.curlg);
@ -3093,7 +3093,7 @@ int xc, yc;
* if fail, leave moondb NULL. * if fail, leave moondb NULL.
*/ */
static void static void
m_readdb() m_readdb (void)
{ {
#define NDBCHUNKS 32 /* malloc room for these many more each time */ #define NDBCHUNKS 32 /* malloc room for these many more each time */
LilXML *xp; LilXML *xp;
@ -3213,7 +3213,7 @@ ncmp_qsort (const void *p1, const void *p2)
/* fill the scrolled list with db names */ /* fill the scrolled list with db names */
static void static void
m_fillSL() m_fillSL (void)
{ {
char **names; char **names;
int i; int i;
@ -3241,7 +3241,7 @@ m_fillSL()
* N.B. we allow for moondb being already NULL. * N.B. we allow for moondb being already NULL.
*/ */
static void static void
m_freedb() m_freedb (void)
{ {
int i, j; int i, j;
@ -3278,7 +3278,7 @@ m_freedb()
/* free the list of sky objects, if any */ /* free the list of sky objects, if any */
static void static void
resetSkyObj () resetSkyObj (void)
{ {
if (skyobjs) { if (skyobjs) {
free ((void *) skyobjs); free ((void *) skyobjs);
@ -3366,7 +3366,7 @@ XEvent *ep;
/* create the popup menu */ /* create the popup menu */
static void static void
m_create_popup() m_create_popup (void)
{ {
Widget w; Widget w;
Arg args[20]; Arg args[20];
@ -3666,7 +3666,7 @@ m_assign_cb (Widget w, XtPointer client, XtPointer call)
/* create the sky background object popup menu */ /* create the sky background object popup menu */
static void static void
m_create_skypopup() m_create_skypopup (void)
{ {
Widget w; Widget w;
Arg args[20]; Arg args[20];
@ -3722,7 +3722,7 @@ Obj *op;
/* create the shell to display lunar orbiter images */ /* create the shell to display lunar orbiter images */
static void static void
mlo_create_shell() mlo_create_shell (void)
{ {
Widget w, credit_w; Widget w, credit_w;
Widget mform_w; Widget mform_w;
@ -3921,7 +3921,7 @@ mlo_load_image (char *base)
/* return 1 if lunar orbiter images appear to be installed, else 0 */ /* return 1 if lunar orbiter images appear to be installed, else 0 */
static int static int
mlo_installed() mlo_installed (void)
{ {
FILE *fp = mlo_open ("IV-130-H1"); FILE *fp = mlo_open ("IV-130-H1");
if (fp) { if (fp) {

10
GUI/xephem/moviemenu.c
View File

@ -77,7 +77,7 @@ static char mlcategory[] = "Movie";
/* bring up the movie loop tool */ /* bring up the movie loop tool */
void void
ml_manage() ml_manage (void)
{ {
/* create shell if first time */ /* create shell if first time */
if (!mlshell_w) if (!mlshell_w)
@ -141,7 +141,7 @@ ml_cursor (Cursor c)
/* create main shell */ /* create main shell */
static void static void
ml_create_shell () ml_create_shell (void)
{ {
Widget pd_w, cb_w, mb_w; Widget pd_w, cb_w, mb_w;
Widget w, f_w, ff_w, rf_w; Widget w, f_w, ff_w, rf_w;
@ -483,7 +483,7 @@ ml_delall_cb (Widget w, XtPointer client, XtPointer data)
/* delete entire movie */ /* delete entire movie */
static void static void
delall() delall (void)
{ {
int i; int i;
@ -712,7 +712,7 @@ addPixmap (Drawable pm, Widget timestamp)
/* stop looping (ok if not) */ /* stop looping (ok if not) */
static void static void
stopLooping() stopLooping (void)
{ {
if (ml_id != 0) { if (ml_id != 0) {
XtRemoveTimeOut (ml_id); XtRemoveTimeOut (ml_id);
@ -723,7 +723,7 @@ stopLooping()
/* create the movie file prefix prompt */ /* create the movie file prefix prompt */
static void static void
ml_create_prepd_w() ml_create_prepd_w (void)
{ {
Widget t_w; Widget t_w;
Arg args[20]; Arg args[20];

8
GUI/xephem/msgmenu.c
View File

@ -41,7 +41,7 @@ static int txtl; /* current length of text in txt_w */
/* called to force the scrolling message window to be up. /* called to force the scrolling message window to be up.
*/ */
void void
msg_manage() msg_manage (void)
{ {
if (!msg_w) if (!msg_w)
msg_create_w(); msg_create_w();
@ -54,7 +54,7 @@ msg_manage()
/* ring the bellm but avoid overdoing a lot of them */ /* ring the bellm but avoid overdoing a lot of them */
void void
msg_bell() msg_bell (void)
{ {
static long lastbellt; static long lastbellt;
long t; long t;
@ -124,7 +124,7 @@ Cursor c;
/* create the message dialog */ /* create the message dialog */
static void static void
msg_create_w() msg_create_w (void)
{ {
static struct { static struct {
char *name; char *name;
@ -249,7 +249,7 @@ char *msg;
/* make sure the text is scrolled to the bottom */ /* make sure the text is scrolled to the bottom */
static void static void
msg_scroll_down() msg_scroll_down (void)
{ {
XmTextSetInsertionPosition (txt_w, txtl); XmTextSetInsertionPosition (txt_w, txtl);
} }

12
GUI/xephem/netmenu.c
View File

@ -105,7 +105,7 @@ init_ssl(char msg[])
/* call to set up without actually bringing up the menus. /* call to set up without actually bringing up the menus.
*/ */
void void
net_create() net_create (void)
{ {
if (!netshell_w) { if (!netshell_w) {
net_create_form(); net_create_form();
@ -114,7 +114,7 @@ net_create()
} }
void void
net_manage() net_manage (void)
{ {
net_create(); net_create();
@ -714,7 +714,7 @@ ssl_recvlineb (XE_SSL_FD *ssl_fd, char *buf, int size)
} }
static void static void
net_create_form() net_create_form (void)
{ {
Widget netform_w; Widget netform_w;
Widget f, w; Widget f, w;
@ -955,7 +955,7 @@ net_create_form()
* respectively (same ones used by netscape) then X resources. * respectively (same ones used by netscape) then X resources.
*/ */
static void static void
defaultSOCKS() defaultSOCKS (void)
{ {
char *str; char *str;
@ -970,7 +970,7 @@ defaultSOCKS()
/* set up the dialog according to our static state */ /* set up the dialog according to our static state */
static void static void
net_setup () net_setup (void)
{ {
/* Net */ /* Net */
XmToggleButtonSetState (ndir_w, !socks_on && !proxy_on, False); XmToggleButtonSetState (ndir_w, !socks_on && !proxy_on, False);
@ -999,7 +999,7 @@ net_setup ()
* if any major trouble, issue xe_msg and return -1, else return 0. * if any major trouble, issue xe_msg and return -1, else return 0.
*/ */
static int static int
net_save () net_save (void)
{ {
char *str, msg[1024]; char *str, msg[1024];
int allok = 1; int allok = 1;

14
GUI/xephem/objmenu.c
View File

@ -91,7 +91,7 @@ static char objcategory[] = "Date index"; /* Save category */
* then we go for it. * then we go for it.
*/ */
void void
obj_manage() obj_manage (void)
{ {
if (!objshell_w) { if (!objshell_w) {
obj_create_shell(); obj_create_shell();
@ -113,7 +113,7 @@ obj_manage()
/* called when a font has changed */ /* called when a font has changed */
void void
obj_newres() obj_newres (void)
{ {
if (cop) if (cop)
obj_setinfo(cop); obj_setinfo(cop);
@ -205,7 +205,7 @@ strnncmp (char *s1, char *s2)
/* called once to build the basic shell and form. /* called once to build the basic shell and form.
*/ */
static void static void
obj_create_shell () obj_create_shell (void)
{ {
typedef struct { typedef struct {
int id; int id;
@ -783,7 +783,7 @@ dbFld (Obj *op)
/* erase info about object /* erase info about object
*/ */
static void static void
obj_unsetinfo() obj_unsetinfo (void)
{ {
if (!objshell_w) if (!objshell_w)
return; return;
@ -844,7 +844,7 @@ obj_ctl_cb (Widget w, XtPointer client, XtPointer call)
} }
static void static void
obj_help() obj_help (void)
{ {
static char *msg[] = { static char *msg[] = {
"List objects in memory, search for an object by name,", "List objects in memory, search for an object by name,",
@ -972,7 +972,7 @@ srch_match (char *p, char *s)
/* set up and display first NBTNS of the dupnames list. /* set up and display first NBTNS of the dupnames list.
*/ */
static void static void
obj_newlist() obj_newlist (void)
{ {
int (*typef)(Obj *) = ty_test(); int (*typef)(Obj *) = ty_test();
DupName *dnp; DupName *dnp;
@ -1072,7 +1072,7 @@ static int
/* fill the name buttons with the next set starting at topi */ /* fill the name buttons with the next set starting at topi */
static void static void
obj_setnames() obj_setnames (void)
{ {
char name[MAXNM]; char name[MAXNM];
int nb; /* number of good buttons to set, turn off others */ int nb; /* number of good buttons to set, turn off others */

16
GUI/xephem/obslog.c
View File

@ -135,7 +135,7 @@ static char olcategory[] = "Logbook"; /* save category */
/* bring up observer's log, create if first time */ /* bring up observer's log, create if first time */
void void
ol_manage() ol_manage (void)
{ {
if (!olshell_w) { if (!olshell_w) {
ol_create(); ol_create();
@ -148,7 +148,7 @@ ol_manage()
/* return whether logbook is currently showing */ /* return whether logbook is currently showing */
int int
ol_isUp() ol_isUp (void)
{ {
return(isUp(olshell_w)); return(isUp(olshell_w));
} }
@ -178,7 +178,7 @@ ol_cursor (Cursor c)
/* create the observer log window */ /* create the observer log window */
static void static void
ol_create() ol_create (void)
{ {
Widget w, sep_w; Widget w, sep_w;
Widget rc_w, fo_w; Widget rc_w, fo_w;
@ -533,7 +533,7 @@ ol_add_cb (Widget w, XtPointer client, XtPointer call)
/* set tags from Now */ /* set tags from Now */
static void static void
fillNowFields() fillNowFields (void)
{ {
Now *np = mm_get_now(); Now *np = mm_get_now();
double lmjd = mjd - tz/24.0; double lmjd = mjd - tz/24.0;
@ -623,7 +623,7 @@ fillObjFields (Obj *op)
/* read the existing log book and list all entries matching the selected fields. /* read the existing log book and list all entries matching the selected fields.
*/ */
static void static void
ol_listLB() ol_listLB (void)
{ {
static LilXML *lp; static LilXML *lp;
XMLEle *root, *ep; XMLEle *root, *ep;
@ -862,7 +862,7 @@ notesMatch (XMLEle *ep)
/* add the current logbook settings to logbook in the private dir */ /* add the current logbook settings to logbook in the private dir */
static void static void
ol_writeLB() ol_writeLB (void)
{ {
FILE *fp; FILE *fp;
char buf[1024]; char buf[1024];
@ -1047,7 +1047,7 @@ sortMatches (XMLEle **mpp, int nmpp)
/* create the observer log list window */ /* create the observer log list window */
static void static void
oll_create() oll_create (void)
{ {
Widget w, fo_w; Widget w, fo_w;
Arg args[20]; Arg args[20];
@ -1160,7 +1160,7 @@ oll_save_cb (Widget w, XtPointer client, XtPointer call)
/* write ollst_w to file named in ollstf_w */ /* write ollst_w to file named in ollstf_w */
static void static void
oll_save() oll_save (void)
{ {
char *fn = XmTextFieldGetString (ollstf_w); char *fn = XmTextFieldGetString (ollstf_w);
FILE *fp = fopend (fn, NULL, "w"); FILE *fp = fopend (fn, NULL, "w");

26
GUI/xephem/plotmenu.c
View File

@ -112,7 +112,7 @@ static int npltlines; /* number of completely defined plots */
* form. otherwise, just get going. * form. otherwise, just get going.
*/ */
void void
plot_manage () plot_manage (void)
{ {
if (!plotshell_w) if (!plotshell_w)
plot_create_shell(); plot_create_shell();
@ -158,7 +158,7 @@ double value;
* write the active plotfields to the current plot file, if one is open. * write the active plotfields to the current plot file, if one is open.
*/ */
void void
plot() plot (void)
{ {
if (plt_fp) { if (plt_fp) {
/* plot in order of original selection */ /* plot in order of original selection */
@ -173,7 +173,7 @@ plot()
} }
int int
plot_ison() plot_ison (void)
{ {
return (plt_fp != 0); return (plt_fp != 0);
} }
@ -205,7 +205,7 @@ int whether;
} }
static void static void
plot_create_shell() plot_create_shell (void)
{ {
XmString str; XmString str;
Widget f_w, rc_w; Widget f_w, rc_w;
@ -696,7 +696,7 @@ plt_undo_cb (Widget w, XtPointer client, XtPointer call)
/* forget our list, and unmanage the table. /* forget our list, and unmanage the table.
*/ */
static void static void
plt_reset() plt_reset (void)
{ {
int i; int i;
@ -710,7 +710,7 @@ plt_reset()
* everybody else to drop their buttons, make sure toggle is off. * everybody else to drop their buttons, make sure toggle is off.
*/ */
static void static void
plt_stop_selecting() plt_stop_selecting (void)
{ {
if (npltlines < MAXPLTLINES) if (npltlines < MAXPLTLINES)
XtUnmanageChild (pltlines[npltlines].c_w[FORM]); XtUnmanageChild (pltlines[npltlines].c_w[FORM]);
@ -722,7 +722,7 @@ plt_stop_selecting()
} }
static void static void
plt_turn_off () plt_turn_off (void)
{ {
if (plt_fp) { if (plt_fp) {
(void) fclose (plt_fp); (void) fclose (plt_fp);
@ -752,7 +752,7 @@ char *name;
/* init npltlines'th row and change prompt to ask for X */ /* init npltlines'th row and change prompt to ask for X */
static void static void
init_row () init_row (void)
{ {
char buf[100]; char buf[100];
@ -791,7 +791,7 @@ add_field (char *name)
/* called from the query routine when want to append to an existing plot file.*/ /* called from the query routine when want to append to an existing plot file.*/
static void static void
plt_try_append() plt_try_append (void)
{ {
plt_turn_on("a"); plt_turn_on("a");
} }
@ -800,14 +800,14 @@ plt_try_append()
* file. * file.
*/ */
static void static void
plt_try_overwrite() plt_try_overwrite (void)
{ {
plt_turn_on("w"); plt_turn_on("w");
} }
/* called from the query routine when want decided not to make a plot file. */ /* called from the query routine when want decided not to make a plot file. */
static void static void
plt_try_cancel() plt_try_cancel (void)
{ {
XmToggleButtonSetState (active_w, False, False); XmToggleButtonSetState (active_w, False, False);
} }
@ -817,7 +817,7 @@ plt_try_cancel()
* but if it does, first ask wheher to append or overwrite. * but if it does, first ask wheher to append or overwrite.
*/ */
static void static void
plt_try_turn_on() plt_try_turn_on (void)
{ {
char *txt; char *txt;
char buf[1024], *fn; char buf[1024], *fn;
@ -1145,7 +1145,7 @@ Widget da_w;
* reset da_w_save and call XPSClose() when finished. * reset da_w_save and call XPSClose() when finished.
*/ */
static void static void
plt_print() plt_print (void)
{ {
if (da_w_save) { if (da_w_save) {
Dimension w, h; Dimension w, h;

2
GUI/xephem/preferences.c
View File

@ -212,7 +212,7 @@ int new;
/* return 1 if want to confirm, else 0 */ /* return 1 if want to confirm, else 0 */
int int
confirm() confirm (void)
{ {
return (pref_get (PREF_CONFIRM) == PREF_CONFIRMON); return (pref_get (PREF_CONFIRM) == PREF_CONFIRMON);
} }

10
GUI/xephem/progress.c
View File

@ -39,7 +39,7 @@ static int nup; /* up/down stack */
/* called to manage the progress meter */ /* called to manage the progress meter */
void void
pm_manage() pm_manage (void)
{ {
if (!pmshell_w) if (!pmshell_w)
pm_createshell(); pm_createshell();
@ -53,7 +53,7 @@ pm_manage()
/* insure the progress meter is visible */ /* insure the progress meter is visible */
void void
pm_up() pm_up (void)
{ {
if (!pmshell_w) if (!pmshell_w)
pm_createshell(); pm_createshell();
@ -67,7 +67,7 @@ pm_up()
/* pop an instance of the progress meter, and unmanage if goes to 0 */ /* pop an instance of the progress meter, and unmanage if goes to 0 */
void void
pm_down() pm_down (void)
{ {
if (!pmshell_w) if (!pmshell_w)
pm_createshell(); pm_createshell();
@ -106,7 +106,7 @@ Cursor c;
/* create the progress meter dialog */ /* create the progress meter dialog */
static void static void
pm_createshell() pm_createshell (void)
{ {
Arg args[20]; Arg args[20];
Widget pm_formw, fr_w, c_w; Widget pm_formw, fr_w, c_w;
@ -297,7 +297,7 @@ int force;
/* make the pm_gc GC and extablish the pm_{f,b}gpix pixels. */ /* make the pm_gc GC and extablish the pm_{f,b}gpix pixels. */
static void static void
make_gc() make_gc (void)
{ {
pm_gc = XCreateGC (XtD, XtWindow(pm_da), 0L, NULL); pm_gc = XCreateGC (XtD, XtWindow(pm_da), 0L, NULL);

18
GUI/xephem/ps.c
View File

@ -151,14 +151,14 @@ void (*go)();
/* return 1 if currently drawing in color, else 0 */ /* return 1 if currently drawing in color, else 0 */
int int
XPSInColor() XPSInColor (void)
{ {
return (xpsc.state == XDRAWING && xpsc.wantcolor); return (xpsc.state == XDRAWING && xpsc.wantcolor);
} }
/* return 1 if currently drawing, else 0 */ /* return 1 if currently drawing, else 0 */
int int
XPSDrawing() XPSDrawing (void)
{ {
return (xpsc.state == XDRAWING); return (xpsc.state == XDRAWING);
} }
@ -547,7 +547,7 @@ int Pw; /* width of Page rectangle */
* this prepares for additional direct entries or closing down. * this prepares for additional direct entries or closing down.
*/ */
void void
XPSXEnd() XPSXEnd (void)
{ {
checkState ("End", XDRAWING); checkState ("End", XDRAWING);
@ -577,7 +577,7 @@ char *s;
/* finish up with any boiler plate, close the file and reset xpsc */ /* finish up with any boiler plate, close the file and reset xpsc */
void void
XPSClose() XPSClose (void)
{ {
char *title; char *title;
@ -1747,7 +1747,7 @@ char *fn;
/* create the print dialog */ /* create the print dialog */
static void static void
create_print_w() create_print_w (void)
{ {
Widget w; Widget w;
Widget f_w, rc_w; Widget f_w, rc_w;
@ -2011,7 +2011,7 @@ toggle_cb (Widget w, XtPointer client, XtPointer call)
/* called to reset the pending print query sequence */ /* called to reset the pending print query sequence */
static void static void
no_go() no_go (void)
{ {
checkState ("no_go", ASKING); checkState ("no_go", ASKING);
xpsc_close(); xpsc_close();
@ -2094,7 +2094,7 @@ XtPointer call;
/* called when we have confirmed it's ok to clobber an existing save file */ /* called when we have confirmed it's ok to clobber an existing save file */
static void static void
saveas_confirm() saveas_confirm (void)
{ {
char *name = XmTextFieldGetString (filename_w); char *name = XmTextFieldGetString (filename_w);
if (XPSOpen (name) == 0) if (XPSOpen (name) == 0)
@ -2105,7 +2105,7 @@ saveas_confirm()
/* finished with xpsc */ /* finished with xpsc */
static void static void
xpsc_close() xpsc_close (void)
{ {
if (xpsc.fp) if (xpsc.fp)
fclose (xpsc.fp); fclose (xpsc.fp);
@ -2123,7 +2123,7 @@ xpsc_close()
/* called when it's confirmed to try and print or save */ /* called when it's confirmed to try and print or save */
/* ARGSUSED */ /* ARGSUSED */
static void static void
call_go () call_go (void)
{ {
/* call the user's function */ /* call the user's function */
if (xpsc.go) if (xpsc.go)

22
GUI/xephem/satmenu.c
View File

@ -161,7 +161,7 @@ static double pole_ra, pole_dec;
* form. otherwise, otherwise, just get out there and do it! * form. otherwise, otherwise, just get out there and do it!
*/ */
void void
sm_manage () sm_manage (void)
{ {
if (!satshell_w) { if (!satshell_w) {
sm_create_shell_w(); sm_create_shell_w();
@ -244,7 +244,7 @@ int how_much;
* rebuild and redraw. * rebuild and redraw.
*/ */
void void
sm_newres() sm_newres (void)
{ {
if (!satshell_w) if (!satshell_w)
return; return;
@ -265,7 +265,7 @@ int appended;
} }
int int
sm_ison() sm_ison (void)
{ {
return (isUp(satshell_w)); return (isUp(satshell_w));
} }
@ -323,14 +323,14 @@ Cursor c;
/* return the name of the resource containing whether this view is up */ /* return the name of the resource containing whether this view is up */
char * char *
sm_viewupres() sm_viewupres (void)
{ {
return ("SatViewUp"); return ("SatViewUp");
} }
/* create the main shell */ /* create the main shell */
static void static void
sm_create_shell_w() sm_create_shell_w (void)
{ {
typedef struct { typedef struct {
char *name; /* toggle button instance name, or NULL */ char *name; /* toggle button instance name, or NULL */
@ -645,7 +645,7 @@ sm_create_shell_w()
/* make the statistics form dialog */ /* make the statistics form dialog */
static void static void
sm_create_ssform_w() sm_create_ssform_w (void)
{ {
typedef struct { typedef struct {
int col; /* C* column code */ int col; /* C* column code */
@ -924,7 +924,7 @@ sm_create_ssform_w()
/* create stform_w, the top view dialog */ /* create stform_w, the top view dialog */
static void static void
sm_create_tvform_w() sm_create_tvform_w (void)
{ {
Arg args[20]; Arg args[20];
int n; int n;
@ -1126,7 +1126,7 @@ XtPointer call;
* we also try to center it just above, but it doesn't always work. * we also try to center it just above, but it doesn't always work.
*/ */
static void static void
st_track_size() st_track_size (void)
{ {
Dimension w, h; Dimension w, h;
Position mfx, mfy, mdx, mdy; Position mfx, mfy, mdx, mdy;
@ -1333,7 +1333,7 @@ sm_da_input_cb (Widget w, XtPointer client, XtPointer call)
/* create the (unmanaged for now) popup menu in smpu_w. */ /* create the (unmanaged for now) popup menu in smpu_w. */
static void static void
sm_create_popup() sm_create_popup (void)
{ {
static Widget *puw[] = { static Widget *puw[] = {
&smpu_name_w, &smpu_name_w,
@ -1515,7 +1515,7 @@ sm_print_cb (Widget w, XtPointer client, XtPointer call)
* call XPSClose() when finished. * call XPSClose() when finished.
*/ */
static void static void
sm_print () sm_print (void)
{ {
Display *dsp = XtDisplay (sda_w); Display *dsp = XtDisplay (sda_w);
Now *np = mm_get_now(); Now *np = mm_get_now();
@ -2302,7 +2302,7 @@ st_ano (double *xS, double *jZ, int *xp, int *yp, int w2x, int arg)
} }
static void static void
make_gcs () make_gcs (void)
{ {
Display *dsp = XtDisplay(toplevel_w); Display *dsp = XtDisplay(toplevel_w);
Window win = XtWindow(toplevel_w); Window win = XtWindow(toplevel_w);

8
GUI/xephem/scope.c
View File

@ -94,7 +94,7 @@ static XtIntervalId marker_tid; /* timer to display sky marker */
static char scopecategory[] = "INDI Configuration"; static char scopecategory[] = "INDI Configuration";
void void
sc_manage() sc_manage (void)
{ {
if (!scopeshell_w) if (!scopeshell_w)
sc_create_w(); sc_create_w();
@ -104,7 +104,7 @@ sc_manage()
} }
void void
sc_unmanage() sc_unmanage (void)
{ {
if (scopeshell_w) if (scopeshell_w)
XtPopdown (scopeshell_w); XtPopdown (scopeshell_w);
@ -124,7 +124,7 @@ sc_gethost (char **host, char **port)
/* return whether we are sending goto commands */ /* return whether we are sending goto commands */
int int
sc_isGotoOn() sc_isGotoOn (void)
{ {
if (!scopeshell_w) if (!scopeshell_w)
sc_create_w(); sc_create_w();
@ -230,7 +230,7 @@ Cursor c;
* init Running TB according to whether process is already running. * init Running TB according to whether process is already running.
*/ */
static void static void
sc_create_w() sc_create_w (void)
{ {
Widget rc_w, f_w, sep_w; Widget rc_w, f_w, sep_w;
Widget scopef_w; Widget scopef_w;

10
GUI/xephem/sites.c
View File

@ -97,7 +97,7 @@ static char twoam[] = " 2:00:00";
/* let user choose a site from a scrolled list */ /* let user choose a site from a scrolled list */
void void
sites_manage() sites_manage (void)
{ {
if (!sites) if (!sites)
read_files(); read_files();
@ -193,7 +193,7 @@ int maxn;
/* make the site selection dialog */ /* make the site selection dialog */
static void static void
create_sq_w() create_sq_w (void)
{ {
Widget w, cl_w, fr_w, add_w; Widget w, cl_w, fr_w, add_w;
Arg args[20]; Arg args[20];
@ -590,7 +590,7 @@ int i;
/* reset the current sites list, read shared then merge private and sort */ /* reset the current sites list, read shared then merge private and sort */
static void static void
read_files () read_files (void)
{ {
char fn[1024]; char fn[1024];
FILE *fp; FILE *fp;
@ -684,7 +684,7 @@ read_file (FILE *fp)
* also tell earth view to redraw. * also tell earth view to redraw.
*/ */
static void static void
fill_list () fill_list (void)
{ {
XmString *xms; XmString *xms;
int i; int i;
@ -1019,7 +1019,7 @@ getPDmH (Widget pd)
/* extend sites[] by one and return pointer to new entry */ /* extend sites[] by one and return pointer to new entry */
static Site * static Site *
moreSites() moreSites (void)
{ {
sites = (Site *) XtRealloc ((void *)sites, (nsites+1)*sizeof(Site)); sites = (Site *) XtRealloc ((void *)sites, (nsites+1)*sizeof(Site));
return (&sites[nsites++]); return (&sites[nsites++]);

10
GUI/xephem/skybinary.c
View File

@ -78,7 +78,7 @@ svbs_manage (Obj *op)
* rebuild and redraw. * rebuild and redraw.
*/ */
void void
svbs_newres() svbs_newres (void)
{ {
if (!bsshell_w) if (!bsshell_w)
return; return;
@ -88,7 +88,7 @@ svbs_newres()
/* create bsshell_w, the top view dialog */ /* create bsshell_w, the top view dialog */
static void static void
bs_create_shell_w() bs_create_shell_w (void)
{ {
typedef struct { typedef struct {
char *label; char *label;
@ -238,7 +238,7 @@ bs_exp_cb (Widget w, XtPointer client, XtPointer call)
/* update bs_pm and ephemerides from bsobj then refresh */ /* update bs_pm and ephemerides from bsobj then refresh */
static void static void
bs_update() bs_update (void)
{ {
Obj *op = &bsobj; Obj *op = &bsobj;
@ -488,7 +488,7 @@ bs_orbit (Obj *op)
/* display bs_pm */ /* display bs_pm */
static void static void
bs_refresh () bs_refresh (void)
{ {
XCopyArea (XtD, bs_pm, XtWindow(bsda_w), bs_gc, 0, 0,bsmapw,bsmaph,0,0); XCopyArea (XtD, bs_pm, XtWindow(bsda_w), bs_gc, 0, 0,bsmapw,bsmaph,0,0);
} }
@ -518,7 +518,7 @@ bs_help_cb (Widget w, XtPointer client, XtPointer call)
} }
static void static void
bs_mkgcs() bs_mkgcs (void)
{ {
XFontStruct *vfp; XFontStruct *vfp;

14
GUI/xephem/skyeyep.c
View File

@ -120,7 +120,7 @@ static double telrad_sz[] = {.5, 2., 4.};
static char skyepcategory[] = "Sky View -- Eyepieces"; static char skyepcategory[] = "Sky View -- Eyepieces";
void void
se_manage() se_manage (void)
{ {
if (!eyep_w) if (!eyep_w)
se_create_eyep_w(); se_create_eyep_w();
@ -128,7 +128,7 @@ se_manage()
} }
void void
se_unmanage() se_unmanage (void)
{ {
if (eyep_w) if (eyep_w)
XtUnmanageChild (eyep_w); XtUnmanageChild (eyep_w);
@ -297,7 +297,7 @@ se_eyepsz(double *wp, double *hp, double *ap, int *rp, int *fp)
/* increase size of eyep[] by one and return pointer to new location */ /* increase size of eyep[] by one and return pointer to new location */
static EyePiece * static EyePiece *
se_addeyep () se_addeyep (void)
{ {
eyep = (EyePiece *) XtRealloc ((void*)eyep, (neyep+1)*sizeof(EyePiece)); eyep = (EyePiece *) XtRealloc ((void*)eyep, (neyep+1)*sizeof(EyePiece));
return (&eyep[neyep++]); return (&eyep[neyep++]);
@ -305,7 +305,7 @@ se_addeyep ()
/* create the eyepiece size dialog */ /* create the eyepiece size dialog */
static void static void
se_create_eyep_w() se_create_eyep_w (void)
{ {
Widget w, sep_w; Widget w, sep_w;
Widget l_w, rb_w; Widget l_w, rb_w;
@ -1116,7 +1116,7 @@ se_delall_cb (Widget w, XtPointer client, XtPointer call)
/* delete memory for and display of all currently placed eyepieces. /* delete memory for and display of all currently placed eyepieces.
*/ */
static void static void
se_delall() se_delall (void)
{ {
XtFree ((void *)eyep); XtFree ((void *)eyep);
eyep = NULL; eyep = NULL;
@ -1200,7 +1200,7 @@ se_calc1_cb (Widget w, XtPointer client, XtPointer call)
} }
static void static void
se_calc1() se_calc1 (void)
{ {
char *tmp, *flstr, *fpstr, sastr[32]; char *tmp, *flstr, *fpstr, sastr[32];
double fl, fp, sa; double fl, fp, sa;
@ -1245,7 +1245,7 @@ se_calc2_cb (Widget w, XtPointer client, XtPointer call)
/* gather values and compute sky angle using formula 2 */ /* gather values and compute sky angle using formula 2 */
static void static void
se_calc2() se_calc2 (void)
{ {
char *tmp, *mflstr, sastr[32]; char *tmp, *mflstr, sastr[32];
double afov, efl, mfl, sa; double afov, efl, mfl, sa;

8
GUI/xephem/skyfifos.c
View File

@ -38,7 +38,7 @@ static int ofifo_fd = -1;
/* return whether either our fifos or INDI is currently accepting commands */ /* return whether either our fifos or INDI is currently accepting commands */
int int
telIsOn() telIsOn (void)
{ {
return (sc_isGotoOn() || !sfifo_outready()); return (sc_isGotoOn() || !sfifo_outready());
} }
@ -65,7 +65,7 @@ telGoto (Obj *op)
* if successful, leave open. harmless if already open. * if successful, leave open. harmless if already open.
*/ */
static int static int
sfifo_outready() sfifo_outready (void)
{ {
char fn[1024]; char fn[1024];
@ -108,7 +108,7 @@ sfifo_sendout (Obj *op)
* a legal string is ever received. harmless to call if already open. * a legal string is ever received. harmless to call if already open.
*/ */
void void
sfifo_openin() sfifo_openin (void)
{ {
char fn[1024]; char fn[1024];
@ -133,7 +133,7 @@ sfifo_openin()
/* close the inbound fifo, if open */ /* close the inbound fifo, if open */
void void
sfifo_closein() sfifo_closein (void)
{ {
if (ififo_fd >= 0) { if (ififo_fd >= 0) {
close (ififo_id); close (ififo_id);

10
GUI/xephem/skyfiltmenu.c
View File

@ -362,7 +362,7 @@ Widget shell_w;
/* return 1 if we are now up, else 0. /* return 1 if we are now up, else 0.
*/ */
int int
svf_ismanaged() svf_ismanaged (void)
{ {
return (filter_w && XtIsManaged(filter_w)); return (filter_w && XtIsManaged(filter_w));
@ -373,7 +373,7 @@ svf_ismanaged()
* to the way the real filter is. * to the way the real filter is.
*/ */
void void
svf_manage() svf_manage (void)
{ {
svf_reset(); svf_reset();
XtManageChild(filter_w); XtManageChild(filter_w);
@ -382,7 +382,7 @@ svf_manage()
/* called to manage the filter dialog. /* called to manage the filter dialog.
*/ */
void void
svf_unmanage() svf_unmanage (void)
{ {
XtUnmanageChild(filter_w); XtUnmanageChild(filter_w);
} }
@ -596,7 +596,7 @@ FilterCat *fcp;
* also, set the mag scales and dot scales from the real mag limits. * also, set the mag scales and dot scales from the real mag limits.
*/ */
static void static void
svf_reset() svf_reset (void)
{ {
int i, j; int i, j;
@ -618,7 +618,7 @@ svf_reset()
* also set the mag limits and dot scale from their controls. * also set the mag limits and dot scale from their controls.
*/ */
static void static void
svf_apply() svf_apply (void)
{ {
int i, j; int i, j;

22
GUI/xephem/skyfits.c
View File

@ -112,7 +112,7 @@ static char skyfitscategory[] = "Sky View -- FITS"; /* Save category */
/* called to manage the fits dialog. /* called to manage the fits dialog.
*/ */
void void
sf_manage() sf_manage (void)
{ {
if (!sf_w) { if (!sf_w) {
sf_create(); sf_create();
@ -125,7 +125,7 @@ sf_manage()
/* called to unmanage the fits dialog. /* called to unmanage the fits dialog.
*/ */
void void
sf_unmanage() sf_unmanage (void)
{ {
if (!sf_w) if (!sf_w)
return; return;
@ -135,7 +135,7 @@ sf_unmanage()
/* return 1 if dialog is up, else 0. /* return 1 if dialog is up, else 0.
*/ */
int int
sf_ismanaged() sf_ismanaged (void)
{ {
return (sf_w && XtIsManaged(sf_w)); return (sf_w && XtIsManaged(sf_w));
} }
@ -322,7 +322,7 @@ char *name;
/* create, but do not manage, the FITS file dialog */ /* create, but do not manage, the FITS file dialog */
static void static void
sf_create() sf_create (void)
{ {
Widget tf_w, bf_w; Widget tf_w, bf_w;
Widget rc_w, rb_w; Widget rc_w, rb_w;
@ -814,7 +814,7 @@ sf_save_cb (Widget w, XtPointer client, XtPointer call)
* we already know everything is ok to just do it now. * we already know everything is ok to just do it now.
*/ */
static void static void
save_file() save_file (void)
{ {
FImage *fip; FImage *fip;
char buf[1024]; char buf[1024];
@ -947,7 +947,7 @@ char buf[];
/* return 0 if have gunzip else -1 */ /* return 0 if have gunzip else -1 */
static int static int
chk_gunzip() chk_gunzip (void)
{ {
#define NOGZEXIT 88 /* any impossible gzip exit value */ #define NOGZEXIT 88 /* any impossible gzip exit value */
static int know = 1; /* 0 or -1 when know for sure */ static int know = 1; /* 0 or -1 when know for sure */
@ -995,7 +995,7 @@ chk_gunzip()
/* return 1 if have/want to use gunzip, else 0 */ /* return 1 if have/want to use gunzip, else 0 */
static int static int
use_gunzip() use_gunzip (void)
{ {
if (chk_gunzip() < 0) { if (chk_gunzip() < 0) {
xe_msg (1,"Can not find %s.\nProceeding without compression", gcmd); xe_msg (1,"Can not find %s.\nProceeding without compression", gcmd);
@ -1105,7 +1105,7 @@ setup_ssldecryption_pipe(int sockfd)
} }
static Survey static Survey
whichSurvey() whichSurvey (void)
{ {
if (XmToggleButtonGetState(dss2r_w)) if (XmToggleButtonGetState(dss2r_w))
return (DSS_2R); return (DSS_2R);
@ -1116,7 +1116,7 @@ whichSurvey()
/* start an input stream reading a FITS image from ESO */ /* start an input stream reading a FITS image from ESO */
static void static void
eso_fits() eso_fits (void)
{ {
static char host[] = "archive.eso.org"; static char host[] = "archive.eso.org";
static FImage fim, *fip = &fim; static FImage fim, *fip = &fim;
@ -1254,7 +1254,7 @@ eso_fits()
/* start an input stream reading a FITS image from STScI */ /* start an input stream reading a FITS image from STScI */
static void static void
stsci_fits() stsci_fits (void)
{ {
static char host[] = "archive.stsci.edu"; static char host[] = "archive.stsci.edu";
static FImage fim, *fip = &fim; static FImage fim, *fip = &fim;
@ -1544,7 +1544,7 @@ double *mjdp;
/* get and display the time of observation from the current FITS image */ /* get and display the time of observation from the current FITS image */
static void static void
sf_setObsDate() sf_setObsDate (void)
{ {
double objsmjd; double objsmjd;

12
GUI/xephem/skyhist.c
View File

@ -243,7 +243,7 @@ Cursor c;
/* close the History control dialog, if any */ /* close the History control dialog, if any */
void void
svh_unmanage() svh_unmanage (void)
{ {
if (svhshell_w) if (svhshell_w)
XtPopdown (svhshell_w); XtPopdown (svhshell_w);
@ -251,7 +251,7 @@ svh_unmanage()
/* get current settings and assign to next position */ /* get current settings and assign to next position */
void void
svh_add_current() svh_add_current (void)
{ {
char buf[32]; char buf[32];
@ -266,14 +266,14 @@ svh_add_current()
/* return the current number of history entries */ /* return the current number of history entries */
int int
svh_nhist() svh_nhist (void)
{ {
return (nhist); return (nhist);
} }
/* display each of the nhist SvHistory entries in the dialog. */ /* display each of the nhist SvHistory entries in the dialog. */
static void static void
show_entries() show_entries (void)
{ {
Widget ww; Widget ww;
Arg args[20]; Arg args[20];
@ -489,7 +489,7 @@ svh_add_cb (Widget w, XtPointer client, XtPointer call)
/* used to delete history entry deli, possibly after confirming */ /* used to delete history entry deli, possibly after confirming */
static int deli; static int deli;
static void static void
del_i() del_i (void)
{ {
/* free ulbl */ /* free ulbl */
XtFree (hist[deli].ulbl); XtFree (hist[deli].ulbl);
@ -526,7 +526,7 @@ svh_del_cb (Widget w, XtPointer client, XtPointer call)
/* used to replace history entry repi, possibly after confirming */ /* used to replace history entry repi, possibly after confirming */
static int repi; static int repi;
static void static void
rep_i() rep_i (void)
{ {
char *ulbl = hist[repi].ulbl; char *ulbl = hist[repi].ulbl;

70
GUI/xephem/skyip.c
View File

@ -228,7 +228,7 @@ static char skyipcategory[] = "Sky View -- Image tools";/* Save category */
/* called to create but not manage the imaging dialog */ /* called to create but not manage the imaging dialog */
void void
si_create() si_create (void)
{ {
if (!si_w) { if (!si_w) {
si_createdialog(); si_createdialog();
@ -244,7 +244,7 @@ si_create()
/* called to bring up the imaging dialog */ /* called to bring up the imaging dialog */
void void
si_manage() si_manage (void)
{ {
si_create(); si_create();
XtManageChild(si_w); XtManageChild(si_w);
@ -252,7 +252,7 @@ si_manage()
/* called to find whether Imaging window is up */ /* called to find whether Imaging window is up */
int int
si_isup() si_isup (void)
{ {
return (isUp (si_w)); return (isUp (si_w));
} }
@ -261,7 +261,7 @@ si_isup()
* N.B. do not try to reclaim memory so we can leave FITS watch on while down. * N.B. do not try to reclaim memory so we can leave FITS watch on while down.
*/ */
void void
si_unmanage() si_unmanage (void)
{ {
if (!si_w) if (!si_w)
return; return;
@ -271,21 +271,21 @@ si_unmanage()
/* return 1 if dialog is up, else 0. /* return 1 if dialog is up, else 0.
*/ */
int int
si_ismanaged() si_ismanaged (void)
{ {
return (si_w && XtIsManaged(si_w)); return (si_w && XtIsManaged(si_w));
} }
/* return 1 if there is currently a valid FITS image available, else 0 */ /* return 1 if there is currently a valid FITS image available, else 0 */
int int
si_ison() si_ison (void)
{ {
return (fimok); return (fimok);
} }
/* discard any current FITS image */ /* discard any current FITS image */
void void
si_off() si_off (void)
{ {
if (fimok) { if (fimok) {
resetFImage (&fim); resetFImage (&fim);
@ -415,7 +415,7 @@ Cursor c;
* if no current FImage, return NULL. * if no current FImage, return NULL.
*/ */
FImage * FImage *
si_getFImage () si_getFImage (void)
{ {
return (fimok ? &fim : NULL); return (fimok ? &fim : NULL);
} }
@ -446,14 +446,14 @@ FImage *fip;
/* return the current Pixmap */ /* return the current Pixmap */
Pixmap Pixmap
si_getPixmap () si_getPixmap (void)
{ {
return (fpm); return (fpm);
} }
/* send the current image to the postscript machine */ /* send the current image to the postscript machine */
void void
si_ps () si_ps (void)
{ {
XPSPixmap (fpm, fpmw, fpmh, xe_cm, 0, 0); XPSPixmap (fpm, fpmw, fpmh, xe_cm, 0, 0);
} }
@ -753,7 +753,7 @@ int nz; /* n zoom entries */
/* compute the histogram for fim and put it in histo[]. /* compute the histogram for fim and put it in histo[].
*/ */
static void static void
build_histo() build_histo (void)
{ {
FImage *fip = &fim; FImage *fip = &fim;
CamPix *ip = (CamPix *)fip->image; CamPix *ip = (CamPix *)fip->image;
@ -798,7 +798,7 @@ build_histo()
* N.B. if we need the histogram, we assume it's already built. * N.B. if we need the histogram, we assume it's already built.
*/ */
static void static void
build_colormap() build_colormap (void)
{ {
int range = hipix - lopix; int range = hipix - lopix;
int g, i; int g, i;
@ -1171,7 +1171,7 @@ char *name;
/* compute wims based on fim */ /* compute wims based on fim */
static void static void
findWholeImageStats() findWholeImageStats (void)
{ {
ImRegion imr; ImRegion imr;
@ -1551,7 +1551,7 @@ double ymin, ymax; /* y range */
/* make some GCs and get some pixels we use in several places */ /* make some GCs and get some pixels we use in several places */
static void static void
mkGCs() mkGCs (void)
{ {
Display *dsp = XtD; Display *dsp = XtD;
Widget tlw = toplevel_w; Widget tlw = toplevel_w;
@ -1580,7 +1580,7 @@ mkGCs()
* use our keywords if present and reasonable. * use our keywords if present and reasonable.
*/ */
static void static void
defContrast() defContrast (void)
{ {
int lpix, hpix; int lpix, hpix;
double gamma; double gamma;
@ -1610,7 +1610,7 @@ defContrast()
/* set up lopix and hipix and a resonable gamma for medium contrast setting */ /* set up lopix and hipix and a resonable gamma for medium contrast setting */
static void static void
si_mcontrast() si_mcontrast (void)
{ {
lopix = h_peaki - (h_peaki - h_mini)/2; lopix = h_peaki - (h_peaki - h_mini)/2;
hipix = h_peaki + (h_maxi - h_peaki)/2; hipix = h_peaki + (h_maxi - h_peaki)/2;
@ -1619,7 +1619,7 @@ si_mcontrast()
/* increase contrast */ /* increase contrast */
static void static void
si_sharper() si_sharper (void)
{ {
lopix += (h_peaki-lopix)/3; lopix += (h_peaki-lopix)/3;
hipix -= (hipix-h_peaki)/3; hipix -= (hipix-h_peaki)/3;
@ -1627,7 +1627,7 @@ si_sharper()
/* decrease contrast */ /* decrease contrast */
static void static void
si_duller() si_duller (void)
{ {
lopix = (3*lopix - h_peaki)/(3-1); lopix = (3*lopix - h_peaki)/(3-1);
if (lopix < h_mini) if (lopix < h_mini)
@ -1648,7 +1648,7 @@ si_duller()
/* set to narrow statistical contrast */ /* set to narrow statistical contrast */
static void static void
si_narrow() si_narrow (void)
{ {
lopix = (int)(wims.mean - wims.std/3); lopix = (int)(wims.mean - wims.std/3);
if (lopix < h_mini) if (lopix < h_mini)
@ -1661,7 +1661,7 @@ si_narrow()
/* set to wide statistical contrast */ /* set to wide statistical contrast */
static void static void
si_wide() si_wide (void)
{ {
lopix = (int)(wims.mean - wims.std); lopix = (int)(wims.mean - wims.std);
if (lopix < h_mini) if (lopix < h_mini)
@ -1674,7 +1674,7 @@ si_wide()
/* set to full pixel contrast */ /* set to full pixel contrast */
static void static void
si_full() si_full (void)
{ {
lopix = h_mini; lopix = h_mini;
hipix = h_maxi; hipix = h_maxi;
@ -1683,7 +1683,7 @@ si_full()
/* increase brightness */ /* increase brightness */
static void static void
si_brighter() si_brighter (void)
{ {
lopix = (3*lopix - h_peaki)/(3-1); lopix = (3*lopix - h_peaki)/(3-1);
if (lopix < h_mini) if (lopix < h_mini)
@ -1693,7 +1693,7 @@ si_brighter()
/* decrease brightness */ /* decrease brightness */
static void static void
si_darker() si_darker (void)
{ {
lopix += (h_peaki-lopix)/3; lopix += (h_peaki-lopix)/3;
hipix = (3*hipix - h_peaki)/(3-1); hipix = (3*hipix - h_peaki)/(3-1);
@ -1747,7 +1747,7 @@ sectionCtrl (Widget par_w, char *hlptag, Widget *tb, char *tbname,
/* create the imaging dialog */ /* create the imaging dialog */
static void static void
si_createdialog() si_createdialog (void)
{ {
Widget mrc_w, rc_w, rc2_w; Widget mrc_w, rc_w, rc2_w;
Widget f_w; Widget f_w;
@ -2388,7 +2388,7 @@ int autocon;
/* set nup and elf from fim */ /* set nup and elf from fim */
static void static void
si_ne() si_ne (void)
{ {
FImage *fip = &fim; FImage *fip = &fim;
double ra1, dec1, ra2, dec2; double ra1, dec1, ra2, dec2;
@ -2736,7 +2736,7 @@ si_inv_cb (Widget w, XtPointer client, XtPointer call)
* N.B. we might be called before the first expose * N.B. we might be called before the first expose
*/ */
static void static void
si_drawHistogram() si_drawHistogram (void)
{ {
#define MAXPTS 50 #define MAXPTS 50
Display *dsp = XtDisplay(fda_w); Display *dsp = XtDisplay(fda_w);
@ -2866,7 +2866,7 @@ si_drawHistogram()
/* set up glass' resources according to current size and mag selections. /* set up glass' resources according to current size and mag selections.
*/ */
static void static void
glassSetup () glassSetup (void)
{ {
glassSize(); glassSize();
@ -2875,7 +2875,7 @@ glassSetup ()
/* set glassmag/sz from widgets */ /* set glassmag/sz from widgets */
static void static void
glassSize() glassSize (void)
{ {
int i; int i;
@ -2907,7 +2907,7 @@ glassSize()
/* (re)make glass_xim of size glasssz and same genre as fim. /* (re)make glass_xim of size glasssz and same genre as fim.
*/ */
static void static void
makeGlassImage () makeGlassImage (void)
{ {
Display *dsp = XtD; Display *dsp = XtD;
char *glassdata; char *glassdata;
@ -3009,7 +3009,7 @@ objf_qsortf (const void *f1p, const void *f2p)
/* find WCS solution for current image. /* find WCS solution for current image.
*/ */
static void static void
wcsMatch () wcsMatch (void)
{ {
Now *np = mm_get_now(); Now *np = mm_get_now();
double mag; double mag;
@ -3189,7 +3189,7 @@ int nfs;
/* return size of glass in whole image pixels, rounded up */ /* return size of glass in whole image pixels, rounded up */
static int static int
glimsz() glimsz (void)
{ {
int proper = (int)ceil(glasssz/glassmag/fmag); int proper = (int)ceil(glasssz/glassmag/fmag);
return (proper >= MINGLSZ ? proper : MINGLSZ); return (proper >= MINGLSZ ? proper : MINGLSZ);
@ -3201,7 +3201,7 @@ glimsz()
/* called to bring up the wcs solver dialog */ /* called to bring up the wcs solver dialog */
void void
siwcs_manage() siwcs_manage (void)
{ {
si_create(); si_create();
XtManageChild(wcs_w); XtManageChild(wcs_w);
@ -3209,7 +3209,7 @@ siwcs_manage()
/* called to bring down the wcs solver dialog */ /* called to bring down the wcs solver dialog */
void void
siwcs_unmanage() siwcs_unmanage (void)
{ {
if (wcs_w) if (wcs_w)
XtUnmanageChild (wcs_w); XtUnmanageChild (wcs_w);
@ -3219,7 +3219,7 @@ siwcs_unmanage()
* return whether all fields are found. * return whether all fields are found.
*/ */
static int static int
initSolverFields () initSolverFields (void)
{ {
char msg[1024]; char msg[1024];
int ok = 1; int ok = 1;
@ -3235,7 +3235,7 @@ initSolverFields ()
/* create the WCS dialog */ /* create the WCS dialog */
static void static void
si_createwcsdialog() si_createwcsdialog (void)
{ {
Widget sep_w, rc_w; Widget sep_w, rc_w;
Widget w; Widget w;

18
GUI/xephem/skylist.c
View File

@ -169,7 +169,7 @@ static int nsortorder; /* number in use */
static char skylcategory[] = "Sky View -- List"; static char skylcategory[] = "Sky View -- List";
void void
sl_manage() sl_manage (void)
{ {
if (!list_w) { if (!list_w) {
sl_create_list_w(); sl_create_list_w();
@ -179,7 +179,7 @@ sl_manage()
} }
void void
sl_unmanage() sl_unmanage (void)
{ {
if (list_w) if (list_w)
XtUnmanageChild (list_w); XtUnmanageChild (list_w);
@ -203,7 +203,7 @@ Cursor c;
/* create the list filename prompt */ /* create the list filename prompt */
static void static void
sl_create_list_w() sl_create_list_w (void)
{ {
Widget dspb_w, lbl_w, tbl_w; Widget dspb_w, lbl_w, tbl_w;
Widget w; Widget w;
@ -468,7 +468,7 @@ sl_create_list_w()
/* create the popup skeleton */ /* create the popup skeleton */
static void static void
sl_create_pu() sl_create_pu (void)
{ {
Widget w; Widget w;
Arg args[20]; Arg args[20];
@ -599,7 +599,7 @@ sl_help_cb (Widget w, XtPointer client, XtPointer call)
* N.B. desensitizing is key because there is NO OVER or UNDERFLOW checking. * N.B. desensitizing is key because there is NO OVER or UNDERFLOW checking.
*/ */
static void static void
sl_clearlast() sl_clearlast (void)
{ {
SortInfo *sip; SortInfo *sip;
@ -834,14 +834,14 @@ char *how;
/* called when we want to append .. filename already checked */ /* called when we want to append .. filename already checked */
static void static void
sl_append_qcb () sl_append_qcb (void)
{ {
sl_save ("a"); sl_save ("a");
} }
/* called when we want to ceate a new text-format file */ /* called when we want to ceate a new text-format file */
static void static void
sl_write_qcb () sl_write_qcb (void)
{ {
sl_save ("w"); sl_save ("w");
} }
@ -1237,7 +1237,7 @@ sort_size (const void *v1, const void *v2)
} }
/* compare 2 ObjInfos for their separation from the current datatable sep /* compare 2 ObjInfos for their separation from the current datatable sep
* object, ala qsort() * object, ala qsort (void)
*/ */
static int static int
sort_sep (const void *v1, const void *v2) sort_sep (const void *v1, const void *v2)
@ -1437,7 +1437,7 @@ char *txt;
* also show count in nl_w. * also show count in nl_w.
*/ */
static void static void
sl_sort () sl_sort (void)
{ {
Now *np = mm_get_now(); Now *np = mm_get_now();
ObjInfo *oinfo = NULL; ObjInfo *oinfo = NULL;

12
GUI/xephem/skytoolbar.c
View File

@ -1007,42 +1007,42 @@ char tt[NOBJTYPES];
/* whether monument view */ /* whether monument view */
int int
svtb_monumentIsOn() svtb_monumentIsOn (void)
{ {
return (monument_on); return (monument_on);
} }
/* whether snap-to-max is on */ /* whether snap-to-max is on */
int int
svtb_snapIsOn() svtb_snapIsOn (void)
{ {
return (snap_on); return (snap_on);
} }
/* whether slice is on */ /* whether slice is on */
int int
svtb_sliceIsOn() svtb_sliceIsOn (void)
{ {
return (slice_on); return (slice_on);
} }
/* whether ROI is on */ /* whether ROI is on */
int int
svtb_ROIIsOn() svtb_ROIIsOn (void)
{ {
return (roi_on); return (roi_on);
} }
/* whether glass is on */ /* whether glass is on */
int int
svtb_glassIsOn() svtb_glassIsOn (void)
{ {
return (glass_on); return (glass_on);
} }
/* whether gauss is on */ /* whether gauss is on */
int int
svtb_gaussIsOn() svtb_gaussIsOn (void)
{ {
return (gauss_on); return (gauss_on);
} }

56
GUI/xephem/skyviewmenu.c
View File

@ -451,7 +451,7 @@ static XtIntervalId fs_to; /* set while checking field stars */
/* bring up Sky view shell, creating if first time */ /* bring up Sky view shell, creating if first time */
void void
sv_manage () sv_manage (void)
{ {
if (!svshell_w) { if (!svshell_w) {
sv_create_svshell(); sv_create_svshell();
@ -475,7 +475,7 @@ sv_manage ()
* rebuild and redraw. * rebuild and redraw.
*/ */
void void
sv_newres() sv_newres (void)
{ {
if (!svshell_w) if (!svshell_w)
return; return;
@ -486,7 +486,7 @@ sv_newres()
/* return true if sky view is up now and ok to draw to, else 0 */ /* return true if sky view is up now and ok to draw to, else 0 */
int int
sv_ison() sv_ison (void)
{ {
return(isUp(svshell_w) && sv_pm); return(isUp(svshell_w) && sv_pm);
} }
@ -547,7 +547,7 @@ int appended;
/* display a new FITS image */ /* display a new FITS image */
void void
sv_newFITS () sv_newFITS (void)
{ {
double ra, dec; double ra, dec;
FImage *fip; FImage *fip;
@ -599,7 +599,7 @@ sv_newFITS ()
/* called to display a FITS image whose aim and scale have already been set. */ /* called to display a FITS image whose aim and scale have already been set. */
void void
sv_dspFITS () sv_dspFITS (void)
{ {
/* build a pixmap to match our current size and orientation */ /* build a pixmap to match our current size and orientation */
si_newPixmap (sv_w, sv_h, flip_lr, flip_tb, zm_undo, zm_cundo); si_newPixmap (sv_w, sv_h, flip_lr, flip_tb, zm_undo, zm_cundo);
@ -610,7 +610,7 @@ sv_dspFITS ()
/* called to turn on the horizon. */ /* called to turn on the horizon. */
void void
sv_hznOn() sv_hznOn (void)
{ {
if (!want_hznmap) if (!want_hznmap)
XmToggleButtonSetState (hznmap_w, True, True); XmToggleButtonSetState (hznmap_w, True, True);
@ -628,7 +628,7 @@ sv_showkeeptelvis (int on)
/* return the name of the resource containing whether this view is up */ /* return the name of the resource containing whether this view is up */
char * char *
sv_viewupres() sv_viewupres (void)
{ {
return ("SkyViewUp"); return ("SkyViewUp");
} }
@ -836,7 +836,7 @@ svh_get (SvHistory *hp)
* interfere with user_automagoff. * interfere with user_automagoff.
*/ */
void void
sv_amagoff () sv_amagoff (void)
{ {
want_automag = 0; want_automag = 0;
XmToggleButtonSetState (wantamag_w, False, False); XmToggleButtonSetState (wantamag_w, False, False);
@ -1037,7 +1037,7 @@ svtb_names_cb (Widget w, XtPointer client, XtPointer call)
/* whether roaming report */ /* whether roaming report */
int int
svtb_reportIsOn() svtb_reportIsOn (void)
{ {
return (want_report); return (want_report);
} }
@ -1170,7 +1170,7 @@ svtb_unzoom_cb (Widget w, XtPointer client, XtPointer call)
/* sync the toolbar to match the options */ /* sync the toolbar to match the options */
static void static void
svtb_sync() svtb_sync (void)
{ {
char tt[NOBJTYPES]; char tt[NOBJTYPES];
char ct[NCLASSES]; char ct[NCLASSES];
@ -2553,7 +2553,7 @@ Widget mb_w;
/* create the main skyview shell */ /* create the main skyview shell */
static void static void
sv_create_svshell() sv_create_svshell (void)
{ {
Widget altdecsc_w, fovsc_w; Widget altdecsc_w, fovsc_w;
Widget mb_w; Widget mb_w;
@ -2967,7 +2967,7 @@ sv_create_svshell()
} }
static void static void
gridStepLabel() gridStepLabel (void)
{ {
/* f_showit avoids blinking when updating scope position */ /* f_showit avoids blinking when updating scope position */
f_showit (vgridl_w, want_aagrid ? "Alt: " : "Dec: "); f_showit (vgridl_w, want_aagrid ? "Alt: " : "Dec: ");
@ -2977,7 +2977,7 @@ gridStepLabel()
/* create the Options dialog. /* create the Options dialog.
*/ */
static void static void
sv_create_options () sv_create_options (void)
{ {
static ViewOpt vopts[] = { static ViewOpt vopts[] = {
{"Just dots", 0, "JustDots", &justdots, &justd_w, {"Just dots", 0, "JustDots", &justdots, &justd_w,
@ -3976,7 +3976,7 @@ sv_print_cb (Widget w, XtPointer client, XtPointer call)
* call XPSClose() when finished. * call XPSClose() when finished.
*/ */
static void static void
sv_print () sv_print (void)
{ {
Now *np = mm_get_now(); Now *np = mm_get_now();
@ -4585,7 +4585,7 @@ Window win;
/* copy the pixmap to the drawing area and add zoom box if on. /* copy the pixmap to the drawing area and add zoom box if on.
*/ */
static void static void
sv_copy_sky() sv_copy_sky (void)
{ {
Display *dsp = XtDisplay (svda_w); Display *dsp = XtDisplay (svda_w);
Window win = XtWindow (svda_w); Window win = XtWindow (svda_w);
@ -4832,7 +4832,7 @@ Boolean *continue_to_dispatch;
/* erase the tracking coords by copying back from sv_pm */ /* erase the tracking coords by copying back from sv_pm */
static void static void
sv_erase_report_coords () sv_erase_report_coords (void)
{ {
Display *dsp = XtDisplay(svda_w); Display *dsp = XtDisplay(svda_w);
Window win = XtWindow(svda_w); Window win = XtWindow(svda_w);
@ -6096,7 +6096,7 @@ sv_riset (Now *np, Obj *op)
/* create the id popup */ /* create the id popup */
static void static void
sv_create_popup() sv_create_popup (void)
{ {
Widget pd_w, cb_w; Widget pd_w, cb_w;
Arg args[20]; Arg args[20];
@ -6721,7 +6721,7 @@ Cardinal *n;
/* remove trails which are no longer turned on. */ /* remove trails which are no longer turned on. */
static void static void
tobj_rmoff() tobj_rmoff (void)
{ {
TrailObj **topp; /* address to be changed if we decide to TrailObj **topp; /* address to be changed if we decide to
* remove *topp * remove *topp
@ -6805,7 +6805,7 @@ int nsky;
* this is done after the db has been reduced. * this is done after the db has been reduced.
*/ */
static void static void
tobj_newdb() tobj_newdb (void)
{ {
TrailObj *top; TrailObj *top;
DBScan dbs; DBScan dbs;
@ -6864,7 +6864,7 @@ Obj *op;
* clipped to the current window. * clipped to the current window.
*/ */
static void static void
tobj_display_all() tobj_display_all (void)
{ {
static int aatrailwarn; static int aatrailwarn;
Display *dsp = XtDisplay(svda_w); Display *dsp = XtDisplay(svda_w);
@ -6948,7 +6948,7 @@ tobj_display_all()
} }
static void static void
aatwarn_msg () aatwarn_msg (void)
{ {
xe_msg (1, xe_msg (1,
"\n\ "\n\
@ -9816,7 +9816,7 @@ objGC(Obj *op, int d, GC *gcp)
* TODO: clean up previous stuff if called more than once. * TODO: clean up previous stuff if called more than once.
*/ */
static void static void
sv_mk_gcs() sv_mk_gcs (void)
{ {
Display *dsp = XtDisplay(toplevel_w); Display *dsp = XtDisplay(toplevel_w);
Window win = XtWindow(toplevel_w); Window win = XtWindow(toplevel_w);
@ -9979,7 +9979,7 @@ int lr;
* return -1 with no change if zoom box center is not in map, else 0. * return -1 with no change if zoom box center is not in map, else 0.
*/ */
static int static int
zm_addundo() zm_addundo (void)
{ {
ZM_Undo *zp; ZM_Undo *zp;
double ad, ar; double ad, ar;
@ -10043,7 +10043,7 @@ zm_addundo()
/* install the zm_cundo entry of the zoom undo stack */ /* install the zm_cundo entry of the zoom undo stack */
static void static void
zm_installundo() zm_installundo (void)
{ {
ZM_Undo *zp = &zm_undo[zm_cundo]; ZM_Undo *zp = &zm_undo[zm_cundo];
@ -10064,14 +10064,14 @@ zm_installundo()
/* discard zoom undo stack deeper than current setting */ /* discard zoom undo stack deeper than current setting */
static void static void
zm_cutundo() zm_cutundo (void)
{ {
zm_nundo = zm_cundo; zm_nundo = zm_cundo;
} }
/* disable and forget all unzooms */ /* disable and forget all unzooms */
static void static void
zm_noundo() zm_noundo (void)
{ {
/* disable for later sv_all's */ /* disable for later sv_all's */
svtb_zoomok(0); svtb_zoomok(0);
@ -10088,7 +10088,7 @@ zm_noundo()
* this is used both to draw and erase. * this is used both to draw and erase.
*/ */
static void static void
zm_draw() zm_draw (void)
{ {
Display *dsp = XtDisplay(svda_w); Display *dsp = XtDisplay(svda_w);
Window win = XtWindow(svda_w); Window win = XtWindow(svda_w);
@ -10265,7 +10265,7 @@ Obj *op;
*/ */
/* ARGSUSED */ /* ARGSUSED */
static void static void
sv_erasetelpd () sv_erasetelpd (void)
{ {
WidgetList ch; WidgetList ch;
Cardinal nch; Cardinal nch;

30
GUI/xephem/solsysmenu.c
View File

@ -183,7 +183,7 @@ static char sstrres[] = "SolSysTrailState"; /* trail resource */
* form. otherwise, just go for it. * form. otherwise, just go for it.
*/ */
void void
ss_manage () ss_manage (void)
{ {
if (!ssshell_w) { if (!ssshell_w) {
XtAppAddActions (xe_app, scuts, XtNumber(scuts)); XtAppAddActions (xe_app, scuts, XtNumber(scuts));
@ -230,7 +230,7 @@ int how_much;
* rebuild and redraw. * rebuild and redraw.
*/ */
void void
ss_newres() ss_newres (void)
{ {
if (!ssshell_w) if (!ssshell_w)
return; return;
@ -248,7 +248,7 @@ int appended;
} }
int int
ss_ison() ss_ison (void)
{ {
return (isUp(ssshell_w)); return (isUp(ssshell_w));
} }
@ -271,14 +271,14 @@ Cursor c;
/* return the name of the resource containing whether this view is up */ /* return the name of the resource containing whether this view is up */
char * char *
ss_viewupres() ss_viewupres (void)
{ {
return ("SolSysViewUp"); return ("SolSysViewUp");
} }
/* create the main solarsystem shell */ /* create the main solarsystem shell */
static void static void
ss_create_shell() ss_create_shell (void)
{ {
typedef struct { typedef struct {
char *label; /* what goes on the help label */ char *label; /* what goes on the help label */
@ -633,7 +633,7 @@ ss_create_shell()
/* create the stereo solarsystem form */ /* create the stereo solarsystem form */
static void static void
st_create_form() st_create_form (void)
{ {
Arg args[20]; Arg args[20];
int n; int n;
@ -822,7 +822,7 @@ ss_print_cb (Widget w, XtPointer client, XtPointer call)
* call XPSClose() when finished. * call XPSClose() when finished.
*/ */
static void static void
ss_print () ss_print (void)
{ {
Now *np = mm_get_now(); Now *np = mm_get_now();
unsigned int nx, ny; unsigned int nx, ny;
@ -1117,7 +1117,7 @@ XtPointer call;
* we also try to position it just to the left, but it doesn't always work. * we also try to position it just to the left, but it doesn't always work.
*/ */
static void static void
st_track_size() st_track_size (void)
{ {
Dimension w, h; Dimension w, h;
Position mfx, mfy; Position mfx, mfy;
@ -1393,7 +1393,7 @@ ss_popup (XEvent *ev, Obj *op, double Mjd, int fav)
/* create the id popup */ /* create the id popup */
static void static void
ss_create_popup() ss_create_popup (void)
{ {
static struct { static struct {
Widget *wp; Widget *wp;
@ -1463,7 +1463,7 @@ ss_create_popup()
* ok to use this everywhere _except_ the individual window expose callbacks. * ok to use this everywhere _except_ the individual window expose callbacks.
*/ */
static void static void
ss_all() ss_all (void)
{ {
watch_cursor (1); watch_cursor (1);
@ -1480,7 +1480,7 @@ ss_all()
/* redraw the main sol system view. /* redraw the main sol system view.
*/ */
static void static void
ss_redraw() ss_redraw (void)
{ {
Display *dsp = XtDisplay(ssda_w); Display *dsp = XtDisplay(ssda_w);
int sv; /* ScaleValue tmp */ int sv; /* ScaleValue tmp */
@ -1664,7 +1664,7 @@ ss_ano (double *sxp, double *syp, int *xp, int *yp, int w2x, int arg)
/* copy the existing main pixmap to the visible screen window */ /* copy the existing main pixmap to the visible screen window */
static void static void
ss_refresh () ss_refresh (void)
{ {
Display *dsp = XtDisplay(ssda_w); Display *dsp = XtDisplay(ssda_w);
Window win = XtWindow(ssda_w); Window win = XtWindow(ssda_w);
@ -1850,7 +1850,7 @@ st_ano (double *sxp, double *syp, int *xp, int *yp, int w2x, int arg)
/* copy the existing stereo pixmap to the visible screen window */ /* copy the existing stereo pixmap to the visible screen window */
static void static void
st_refresh() st_refresh (void)
{ {
Display *dsp = XtDisplay(stda_w); Display *dsp = XtDisplay(stda_w);
Window win = XtWindow(stda_w); Window win = XtWindow(stda_w);
@ -2230,7 +2230,7 @@ int lbl;
/* free allp array, if any */ /* free allp array, if any */
static void static void
ap_free() ap_free (void)
{ {
if (allp) { if (allp) {
free ((void *)allp); free ((void *)allp);
@ -2305,7 +2305,7 @@ ss_fav_cb (Widget w, XtPointer client, XtPointer call)
* TODO: reclaim old stuff if called again. * TODO: reclaim old stuff if called again.
*/ */
static void static void
mk_gcs() mk_gcs (void)
{ {
Display *dsp = XtDisplay(ssda_w); Display *dsp = XtDisplay(ssda_w);
Window win = XtWindow(ssda_w); Window win = XtWindow(ssda_w);

4
GUI/xephem/splash.c
View File

@ -110,7 +110,7 @@ splashMsg (char *fmt, ...)
/* called by the real xephem to close the splash window */ /* called by the real xephem to close the splash window */
void void
splashClose () splashClose (void)
{ {
if (!splashpipe) if (!splashpipe)
return; return;
@ -366,7 +366,7 @@ noteSplash (int on)
/* return 1 if flag file indicates we want splash else 0 */ /* return 1 if flag file indicates we want splash else 0 */
static int static int
wantSplash() wantSplash (void)
{ {
char nos[1024]; char nos[1024];
FILE *fp; FILE *fp;

14
GUI/xephem/srchmenu.c
View File

@ -95,7 +95,7 @@ static Goal goals[] = {
* form. otherwise, just go for it. * form. otherwise, just go for it.
*/ */
void void
srch_manage () srch_manage (void)
{ {
if (!srchshell_w) if (!srchshell_w)
srch_create_shell(); srch_create_shell();
@ -203,7 +203,7 @@ double *tmincp;
* searching (obviously) or the srch control menu is up. * searching (obviously) or the srch control menu is up.
*/ */
int int
srch_ison() srch_ison (void)
{ {
return (prog_isgood() && (srching_now() || srch_isup())); return (prog_isgood() && (srching_now() || srch_isup()));
} }
@ -239,7 +239,7 @@ Cursor c;
} }
static void static void
srch_create_shell() srch_create_shell (void)
{ {
XmString str; XmString str;
Widget w, trc_w, brc_w, f_w, rb_w; Widget w, trc_w, brc_w, f_w, rb_w;
@ -570,7 +570,7 @@ srch_create_shell()
/* set tmlimit from user's widget */ /* set tmlimit from user's widget */
static void static void
get_tmlimit() get_tmlimit (void)
{ {
char *str = XmTextFieldGetString (acc_w); char *str = XmTextFieldGetString (acc_w);
f_scansexa (str, &tmlimit); f_scansexa (str, &tmlimit);
@ -579,7 +579,7 @@ get_tmlimit()
/* return True whenever the srch control menu is up */ /* return True whenever the srch control menu is up */
static int static int
srch_isup() srch_isup (void)
{ {
return (isUp(srchshell_w)); return (isUp(srchshell_w));
} }
@ -587,7 +587,7 @@ srch_isup()
/* return True whenever we are actually in the midst of controlling a search. /* return True whenever we are actually in the midst of controlling a search.
*/ */
static int static int
srching_now() srching_now (void)
{ {
return (on_w && XmToggleButtonGetState(on_w)); return (on_w && XmToggleButtonGetState(on_w));
} }
@ -864,7 +864,7 @@ srch_on_off_cb (Widget w, XtPointer client, XtPointer call)
} }
static void static void
compile_func() compile_func (void)
{ {
char *newexp; char *newexp;
char errbuf[256]; char errbuf[256];

18
GUI/xephem/sunmenu.c
View File

@ -117,7 +117,7 @@ static char suncategory[] = "Sun";
/* bring up the sun menu, creating if first time */ /* bring up the sun menu, creating if first time */
void void
sun_manage() sun_manage (void)
{ {
if (!sunshell_w) { if (!sunshell_w) {
sun_create_shell(); sun_create_shell();
@ -162,7 +162,7 @@ sun_cursor (Cursor c)
/* called when basic resources change */ /* called when basic resources change */
void void
sun_newres() sun_newres (void)
{ {
if (!sunshell_w) if (!sunshell_w)
return; return;
@ -171,14 +171,14 @@ sun_newres()
/* return the name of the resource containing whether this view is up */ /* return the name of the resource containing whether this view is up */
char * char *
sun_viewupres() sun_viewupres (void)
{ {
return ("SunViewUp"); return ("SunViewUp");
} }
/* create main shell */ /* create main shell */
static void static void
sun_create_shell () sun_create_shell (void)
{ {
Widget pd_w, cb_w, mb_w; Widget pd_w, cb_w, mb_w;
Widget w, f_w; Widget w, f_w;
@ -553,7 +553,7 @@ sun_mloop_cb (Widget w, XtPointer client, XtPointer data)
* call XPSClose() when finished. * call XPSClose() when finished.
*/ */
static void static void
sun_print () sun_print (void)
{ {
Display *dsp = XtDisplay(sunda_w); Display *dsp = XtDisplay(sunda_w);
Window win = XtWindow(sunda_w); Window win = XtWindow(sunda_w);
@ -608,7 +608,7 @@ sun_print ()
} }
static void static void
sun_ps_annotate() sun_ps_annotate (void)
{ {
Now *np = mm_get_now(); Now *np = mm_get_now();
char dir[128]; char dir[128];
@ -644,7 +644,7 @@ sun_ps_annotate()
/* load one file initially for fun */ /* load one file initially for fun */
static void static void
sun_load1() sun_load1 (void)
{ {
char **files; char **files;
int nfiles; int nfiles;
@ -873,7 +873,7 @@ sun_motion_eh (Widget w, XtPointer client, XEvent *ev, Boolean *dispatch)
* return 0 if ok else xe_msg and -1 * return 0 if ok else xe_msg and -1
*/ */
static int static int
readSOHOImage() readSOHOImage (void)
{ {
char fn[1024]; char fn[1024];
int t, s; int t, s;
@ -1138,7 +1138,7 @@ scanDir (char *dir, char ***files, int nfiles)
} }
static void static void
sun_refresh() sun_refresh (void)
{ {
Dimension w, h; Dimension w, h;

6
GUI/xephem/tips.c
View File

@ -86,7 +86,7 @@ char *tip;
/* go through all the tips and make sure they are all down. /* go through all the tips and make sure they are all down.
*/ */
void void
wtip_alldown() wtip_alldown (void)
{ {
Tip *tp, *ltp; Tip *tp, *ltp;
@ -102,7 +102,7 @@ wtip_alldown()
* TODO: reclaim old stuff when called again * TODO: reclaim old stuff when called again
*/ */
void void
wtip_init () wtip_init (void)
{ {
Display *dsp = XtDisplay(toplevel_w); Display *dsp = XtDisplay(toplevel_w);
Window root = RootWindow (dsp, DefaultScreen(dsp)); Window root = RootWindow (dsp, DefaultScreen(dsp));
@ -384,7 +384,7 @@ tip_sf (const void *a1, const void *a2)
/* sort the tips array by widget id, then mark it sorted */ /* sort the tips array by widget id, then mark it sorted */
static void static void
tip_sort () tip_sort (void)
{ {
if (ntips > 0) if (ntips > 0)
qsort ((void *)tips, ntips, sizeof(Tip), tip_sf); qsort ((void *)tips, ntips, sizeof(Tip), tip_sf);

2
GUI/xephem/trailmenu.c
View File

@ -192,7 +192,7 @@ XtPointer client) /* saved and passed back to (*cb)() */
* TODO: reclaim old stuff when called again. * TODO: reclaim old stuff when called again.
*/ */
void void
tr_newres() tr_newres (void)
{ {
tr_fs = NULL; tr_fs = NULL;
} }

22
GUI/xephem/uranusmenu.c
View File

@ -148,7 +148,7 @@ static double pole_ra, pole_dec;
* form. otherwise, just get out there and do it! * form. otherwise, just get out there and do it!
*/ */
void void
um_manage () um_manage (void)
{ {
if (!ushell_w) { if (!ushell_w) {
um_create_shell_w(); um_create_shell_w();
@ -227,7 +227,7 @@ int how_much;
* rebuild and redraw. * rebuild and redraw.
*/ */
void void
um_newres() um_newres (void)
{ {
if (!ushell_w) if (!ushell_w)
return; return;
@ -248,7 +248,7 @@ int appended;
} }
int int
um_ison() um_ison (void)
{ {
return (isUp(ushell_w)); return (isUp(ushell_w));
} }
@ -306,14 +306,14 @@ Cursor c;
/* return the name of the resource containing whether this view is up */ /* return the name of the resource containing whether this view is up */
char * char *
um_viewupres() um_viewupres (void)
{ {
return ("UranusViewUp"); return ("UranusViewUp");
} }
/* create the main shell */ /* create the main shell */
static void static void
um_create_shell_w() um_create_shell_w (void)
{ {
typedef struct { typedef struct {
char *name; /* toggle button instance name, or NULL */ char *name; /* toggle button instance name, or NULL */
@ -628,7 +628,7 @@ um_create_shell_w()
/* make the statistics form dialog */ /* make the statistics form dialog */
static void static void
um_create_usform_w() um_create_usform_w (void)
{ {
typedef struct { typedef struct {
int col; /* C* column code */ int col; /* C* column code */
@ -848,7 +848,7 @@ um_create_usform_w()
/* create utform_w, the top view dialog */ /* create utform_w, the top view dialog */
static void static void
um_create_tvform_w() um_create_tvform_w (void)
{ {
Arg args[20]; Arg args[20];
int n; int n;
@ -1047,7 +1047,7 @@ XtPointer call;
* we also try to center it just above, but it doesn't always work. * we also try to center it just above, but it doesn't always work.
*/ */
static void static void
ut_track_size() ut_track_size (void)
{ {
Dimension w, h; Dimension w, h;
Position mfx, mfy, mdx, mdy; Position mfx, mfy, mdx, mdy;
@ -1249,7 +1249,7 @@ um_da_input_cb (Widget w, XtPointer client, XtPointer call)
/* create the (unmanaged for now) popup menu in umpu_w. */ /* create the (unmanaged for now) popup menu in umpu_w. */
static void static void
um_create_popup() um_create_popup (void)
{ {
static Widget *puw[] = { static Widget *puw[] = {
&umpu_name_w, &umpu_name_w,
@ -1422,7 +1422,7 @@ um_print_cb (Widget w, XtPointer client, XtPointer call)
* call XPSClose() when finished. * call XPSClose() when finished.
*/ */
static void static void
um_print () um_print (void)
{ {
Display *dsp = XtDisplay (uda_w); Display *dsp = XtDisplay (uda_w);
Now *np = mm_get_now(); Now *np = mm_get_now();
@ -1933,7 +1933,7 @@ ut_ano (double *uX, double *jZ, int *xp, int *yp, int w2x, int arg)
static void static void
make_gcs () make_gcs (void)
{ {
Display *dsp = XtDisplay(toplevel_w); Display *dsp = XtDisplay(toplevel_w);
Window win = XtWindow(toplevel_w); Window win = XtWindow(toplevel_w);

8
GUI/xephem/versionmenu.c
View File

@ -128,7 +128,7 @@ static int maxtail; /* max tail len (ie, tail@peri), pixels */
/* called when mainmenu "About.." help is selected. /* called when mainmenu "About.." help is selected.
*/ */
void void
version() version (void)
{ {
/* make the version form if this is our first time. /* make the version form if this is our first time.
* also take this opportunity to do things once to init the * also take this opportunity to do things once to init the
@ -165,7 +165,7 @@ Cursor c;
/* make the v_w widget. /* make the v_w widget.
*/ */
static void static void
v_create_vshell() v_create_vshell (void)
{ {
Widget pw_w; Widget pw_w;
Widget vform_w; Widget vform_w;
@ -348,7 +348,7 @@ v_da_exp_cb (Widget w, XtPointer client, XtPointer call)
} }
static void static void
v_draw() v_draw (void)
{ {
Display *dsp = XtDisplay(vda_w); Display *dsp = XtDisplay(vda_w);
Window win = XtWindow(vda_w); Window win = XtWindow(vda_w);
@ -513,7 +513,7 @@ int sx, sy, w, h;
} }
static void static void
v_define_gc() v_define_gc (void)
{ {
Display *dsp = XtDisplay(vda_w); Display *dsp = XtDisplay(vda_w);
Window win = XtWindow(vda_w); Window win = XtWindow(vda_w);

4
GUI/xephem/webdbmenu.c
View File

@ -60,7 +60,7 @@ static AstInfo astinfo[] = {
static char wdbcategory[] = "Web Databases"; /* Save category */ static char wdbcategory[] = "Web Databases"; /* Save category */
void void
wdb_manage() wdb_manage (void)
{ {
if (!wdbshell_w) if (!wdbshell_w)
wdb_create(); wdb_create();
@ -86,7 +86,7 @@ Cursor c;
} }
static void static void
wdb_create() wdb_create (void)
{ {
Widget mf_w, f_w, rc_w; Widget mf_w, f_w, rc_w;
Widget pb_w, tf_w; Widget pb_w, tf_w;

16
GUI/xephem/xephem.c
View File

@ -371,7 +371,7 @@ setup_icon (Widget w)
* finally add any fallbacks[] not already in db. * finally add any fallbacks[] not already in db.
*/ */
static void static void
addOurDBs() addOurDBs (void)
{ {
XrmDatabase dspdb = XtDatabase (XtD); XrmDatabase dspdb = XtDatabase (XtD);
XrmDatabase fbdb = NULL; XrmDatabase fbdb = NULL;
@ -443,7 +443,7 @@ char *argv[];
/* support position of main window in our preferences system */ /* support position of main window in our preferences system */
static void static void
chk_pos() chk_pos (void)
{ {
Position x = (Position)atoi(getXRes ("x", "100")); /* XEphem.x */ Position x = (Position)atoi(getXRes ("x", "100")); /* XEphem.x */
Position y = (Position)atoi(getXRes ("y", "100")); /* XEphem.y */ Position y = (Position)atoi(getXRes ("y", "100")); /* XEphem.y */
@ -458,7 +458,7 @@ chk_pos()
/* insure that resource version and (sometimes) X server matches. */ /* insure that resource version and (sometimes) X server matches. */
static void static void
chk_version() chk_version (void)
{ {
char *v = getXRes ("Version", "??"); char *v = getXRes ("Version", "??");
@ -469,7 +469,7 @@ chk_version()
} }
static void static void
set_title() set_title (void)
{ {
char title[100]; char title[100];
@ -481,7 +481,7 @@ set_title()
* initial xephem buttons. * initial xephem buttons.
*/ */
static void static void
make_main_window () make_main_window (void)
{ {
static ButtonInfo file_buttons[] = { static ButtonInfo file_buttons[] = {
{"Display a dialog containing supporting informational messages", {"Display a dialog containing supporting informational messages",
@ -787,7 +787,7 @@ reapchildren (int signo)
} }
static void static void
setup_sigs() setup_sigs (void)
{ {
/* ignore FPE, though we do have a matherr() handler in misc.c. */ /* ignore FPE, though we do have a matherr() handler in misc.c. */
(void) signal (SIGFPE, SIG_IGN); (void) signal (SIGFPE, SIG_IGN);
@ -805,7 +805,7 @@ setup_sigs()
} }
static void static void
hlp_onContext() hlp_onContext (void)
{ {
static Cursor qc; static Cursor qc;
Display *dsp = XtDisplay (toplevel_w); Display *dsp = XtDisplay (toplevel_w);
@ -857,7 +857,7 @@ hlp_onContext()
/* bring up the initial set of desired windows */ /* bring up the initial set of desired windows */
static void static void
initialUps() initialUps (void)
{ {
if (atoi(getXRes (dm_viewupres(), "0"))) if (atoi(getXRes (dm_viewupres(), "0")))
dm_manage(); dm_manage();