debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dtcalc: Remove more 'extern' variables in .c files, by putting them in .h. Also reduce scope of vars and funcs with static.

Browse Source
This commit is contained in:
Peter Howkins
2021-11-25 04:29:25 +00:00
parent a9175c896d
commit 9f8dbf6a6c
10 changed files with 94 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cde/programs/dtcalc/calctool.h
View File

@@ -442,11 +442,14 @@ struct button {
char *resname ; /* Button resource name. */
void (*func)() ; /* Function to obey on button press. */
} ;
extern struct button buttons[] ; /* Calculator button values. */
extern struct button mode_buttons[] ; /* Special "mode" buttons. */
struct menu_entry {
char *str ; /* Menu entry string to be displayed. */
char val ; /* Value when selected. */
} ;
extern struct menu_entry menu_entries[] ; /* All the menu strings. */
struct menu {
char *title ; /* Menu title. */
@@ -454,6 +457,7 @@ struct menu {
int mindex ; /* Index into menu string array. */
int defval ; /* Default menu item position (from 1). */
} ;
extern struct menu cmenus[] ; /* Calculator menus. */
struct calcVars { /* Calctool variables and options. */
char *appname ; /* Application name for resources. */
@@ -539,6 +543,11 @@ struct calcVars { /* Calctool variables and options. */
extern struct calcVars CalcVars;
typedef struct calcVars *Vars ;
extern Vars v ; /* Calctool variables and options. */
extern void matherr(void); // calctool.c
/* Structure, resource definitions, for View's optional parameters. */
typedef struct
@@ -754,10 +763,7 @@ void mpunfl(int *);
void Help(char *, char *);
void HelpRequestCB(Widget, caddr_t, caddr_t);
void HelpModeCB(Widget, caddr_t, caddr_t);
void HelpCloseCB(Widget, caddr_t, caddr_t);
void HelpHyperlinkCB(Widget, caddr_t, caddr_t);
void DisplayHelp(char *, char *);
void CenterMsgCB(Widget, XtPointer, XtPointer);
void HelpHelp(void);
void SetWmHnts(void);