54007: remove some uses of mod_export that were likely unintended

Oliver Kiddle · Oliver Kiddle · commit 6ac61e9a8f63 · 2025-10-31T09:33:27.000+01:00
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2025-10-31  Oliver Kiddle  <opk@zsh.org>
+
+	* 54007: Src/exec.c, Src/hist.c, Src/init.c, Src/jobs.c, Src/module.c,
+	Src/params.c, Src/signals.c, Src/Zle/complete.c, Src/Zle/zle_misc.c,
+	Src/Zle/compresult.c, Src/Zle/zle_keymap.c, Src/Zle/zle_main.c:
+	remove some uses of mod_export that were likely unintended
+
 2025-10-27  Bart Schaefer  <schaefer@zsh.org>
 
 	* Dan Drake: 53803: Functions/Prompts/prompt_adam1_setup: make
diff --git a/Src/Zle/complete.c b/Src/Zle/complete.c
@@ -183,7 +183,7 @@ cpcmatcher(Cmatcher m)
  */
 
 /**/
-mod_export Cpattern
+static Cpattern
 cp_cpattern_element(Cpattern o)
 {
     Cpattern n = zalloc(sizeof(struct cpattern));
diff --git a/Src/Zle/compresult.c b/Src/Zle/compresult.c
@@ -1961,7 +1961,7 @@ asklist(void)
 }
 
 /**/
-mod_export int
+static int
 printlist(int over, CLPrintFunc printm, int showall)
 {
     Cmgroup g;
diff --git a/Src/Zle/zle_keymap.c b/Src/Zle/zle_keymap.c
@@ -1500,7 +1500,7 @@ default_bindings(void)
  */
 
 /**/
-mod_export ZLE_INT_T
+static ZLE_INT_T
 getrestchar_keybuf(void)
 {
     char c;
diff --git a/Src/Zle/zle_main.c b/Src/Zle/zle_main.c
@@ -126,8 +126,7 @@ mod_export Thingy lbindk, bindk;
 /**/
 int insmode;
 
-/**/
-mod_export int eofchar;
+static int eofchar;
 
 static int eofsent;
 /*
@@ -2048,7 +2047,7 @@ resetprompt(UNUSED(char **args))
 /* same bug called from outside zle */
 
 /**/
-mod_export void
+static void
 zle_resetprompt(void)
 {
     reexpandprompt();
diff --git a/Src/Zle/zle_misc.c b/Src/Zle/zle_misc.c
@@ -1539,7 +1539,7 @@ addsuffix(int tp, int flags, ZLE_STRING_T chars, int lenstr, int lensuf)
 /* Same as addsuffix, but from metafied string */
 
 /**/
-mod_export void
+static void
 addsuffixstring(int tp, int flags, char *chars, int lensuf)
 {
     int slen, alloclen;
diff --git a/Src/exec.c b/Src/exec.c
@@ -4828,7 +4828,7 @@ getoutput(char *cmd, int qt)
  */
 
 /**/
-mod_export LinkList
+static LinkList
 readoutput(int in, int qt, int *readerror)
 {
     LinkList ret;
diff --git a/Src/hist.c b/Src/hist.c
@@ -2417,7 +2417,7 @@ convamps(char *out, char *in, int inlen)
 }
 
 /**/
-mod_export void
+static void
 checkcurline(Histent he)
 {
     if (he->histnum == curhist && (histactive & HA_ACTIVE)) {
diff --git a/Src/init.c b/Src/init.c
@@ -84,7 +84,9 @@ mod_export int tclen[TC_COUNT];
 /**/
 int tclines, tccolumns;
 /**/
-mod_export int hasam, hasbw, hasxn, hasye;
+mod_export int hasam;
+/**/
+int hasxn;
 
 /* Value of the Co (max_colors) entry: may not be set */
 
@@ -97,7 +99,7 @@ mod_export int tccolours;
 mod_export sigset_t sigchld_mask;
 
 /**/
-mod_export struct hookdef zshhooks[] = {
+struct hookdef zshhooks[] = {
     HOOKDEF("exit", NULL, HOOKF_ALL),
     HOOKDEF("before_trap", NULL, HOOKF_ALL),
     HOOKDEF("after_trap", NULL, HOOKF_ALL),
@@ -815,9 +817,7 @@ init_term(void)
 
 	/* check whether terminal has automargin (wraparound) capability */
 	hasam = tgetflag("am");
-	hasbw = tgetflag("bw");
 	hasxn = tgetflag("xn"); /* also check for newline wraparound glitch */
-	hasye = tgetflag("YE"); /* print in last column does carriage return */
 
 	tclines = tgetnum("li");
 	tccolumns = tgetnum("co");
@@ -870,6 +870,8 @@ init_term(void)
 	rprompt_indent = 1; /* If you change this, update rprompt_indent_unsetfn() */
 	/* The following is an attempt at a heuristic,
 	 * but it fails in some cases */
+	/* int hasbw = tgetflag("bw"); */
+	/* int hasye = tgetflag("YE"); */ /* print in last column does carriage return */
 	/* rprompt_indent = ((hasam && !hasbw) || hasye || !tccan(TCLEFT)); */
 
 	/* if there's no termcap entry for italics, use CSI 3 m */
diff --git a/Src/jobs.c b/Src/jobs.c
@@ -55,7 +55,7 @@
    when we started without being process group leader */
 
 /**/
-mod_export pid_t origpgrp;
+pid_t origpgrp;
 
 /* the process group of the shell */
 
@@ -98,12 +98,10 @@ mod_export int jobtabsize;
 mod_export int maxjob;
 
 /* If we have entered a subshell, the original shell's job table. */
-/**/
-mod_export struct job *oldjobtab;
+static struct job *oldjobtab;
 
 /* The size of that. */
-/**/
-mod_export int oldmaxjob;
+static int oldmaxjob;
 
 /* shell timings */
  
@@ -1833,7 +1831,7 @@ clearjobtab(int monitor)
 /* In a subshell, decide we want our own job table after all. */
 
 /**/
-mod_export void
+void
 clearoldjobtab(void)
 {
     if (oldjobtab)
diff --git a/Src/module.c b/Src/module.c
@@ -1337,7 +1337,7 @@ addmathfunc(MathFunc f)
 /* Delete a single math function */
 
 /**/
-mod_export int
+int
 deletemathfunc(MathFunc f)
 {
     MathFunc p, q;
diff --git a/Src/params.c b/Src/params.c
@@ -56,7 +56,6 @@ mod_export int locallevel;
 /* Variables holding values of special parameters */
  
 /**/
-mod_export
 char **pparams,		/* $argv        */
      **cdpath,		/* $cdpath      */
      **fpath,		/* $fpath       */
@@ -70,13 +69,11 @@ char **path,		/* $path        */
      **fignore;		/* $fignore     */
  
 /**/
-mod_export
 char *argzero,		/* $0           */
-     *posixzero,	/* $0           */
-     *home,		/* $HOME        */
+     *ifs,		/* $IFS         */
      *nullcmd,		/* $NULLCMD     */
      *oldpwd,		/* $OLDPWD      */
-     *zoptarg,		/* $OPTARG      */
+     *posixzero,	/* $0           */
      *prompt,		/* $PROMPT      */
      *prompt2,		/* $PROMPT2     */
      *prompt3,		/* $PROMPT3     */
@@ -85,14 +82,15 @@ char *argzero,		/* $0           */
      *rprompt,		/* $RPROMPT     */
      *rprompt2,		/* $RPROMPT2    */
      *sprompt,		/* $SPROMPT     */
-     *wordchars;	/* $WORDCHARS   */
+     *wordchars,	/* $WORDCHARS   */
+     *zoptarg,		/* $OPTARG      */
+     *zsh_terminfo,     /* $TERMINFO    */
+     *zsh_terminfodirs; /* $TERMINFO_DIRS */
 /**/
 mod_export
-char *ifs,		/* $IFS         */
+char *home,		/* $HOME        */
      *postedit,		/* $POSTEDIT    */
      *term,		/* $TERM        */
-     *zsh_terminfo,     /* $TERMINFO    */
-     *zsh_terminfodirs, /* $TERMINFO_DIRS */
      *ttystrname,	/* $TTY         */
      *pwd;		/* $PWD         */
 
@@ -973,7 +971,7 @@ createparamtable(void)
 /* assign various functions used for non-special parameters */
 
 /**/
-mod_export void
+static void
 assigngetset(Param pm)
 {
     switch (PM_TYPE(pm->node.flags)) {
@@ -2667,7 +2665,7 @@ setstrvalue(Value v, char *val)
 }
 
 /**/
-mod_export void
+static void
 assignstrvalue(Value v, char *val, int flags)
 {
     if (unset(EXECOPT))
@@ -3634,7 +3632,7 @@ sethparam(char *s, char **val)
  */
 
 /**/
-mod_export Param
+static Param
 assignnparam(char *s, mnumber val, int flags)
 {
     struct value vbuf;
@@ -4271,15 +4269,15 @@ arrvarsetfn(Param pm, char **x)
 }
 
 /**/
-mod_export char *
+char *
 colonarrgetfn(Param pm)
 {
     char ***dptr = (char ***)pm->u.data;
     return *dptr ? zjoin(*dptr, ':', 1) : "";
 }
 
 /**/
-mod_export void
+void
 colonarrsetfn(Param pm, char *x)
 {
     char ***dptr = (char ***)pm->u.data;
@@ -6445,7 +6443,7 @@ setscope(Param pm)
 }
 
 /**/
-mod_export Param
+static Param
 upscope(Param pm, int reflevel)
 {
     Param up = pm->old;
@@ -6466,7 +6464,7 @@ upscope_upper(Param pm, int reflevel)
 }
 
 /**/
-mod_export int
+static int
 valid_refname(char *val)
 {
     char *t = itype_end(val, INAMESPC, 0);
diff --git a/Src/signals.c b/Src/signals.c
@@ -87,9 +87,9 @@ mod_export volatile int queue_in;
 /* Variables used by trap queueing */
 
 /**/
-mod_export volatile int trap_queueing_enabled, trap_queue_front, trap_queue_rear;
+static volatile int trap_queueing_enabled, trap_queue_front, trap_queue_rear;
 /**/
-mod_export int trap_queue[MAX_QUEUE_SIZE];
+static int trap_queue[MAX_QUEUE_SIZE];
 
 /* Install signal handler for given signal.           *
  * If possible, we want to make sure that interrupted *

Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ cpcmatcher(Cmatcher m)`
`183`	`183`	`*/`
`184`	`184`
`185`	`185`	`/**/`
`186`		`-mod_export Cpattern`
	`186`	`+static Cpattern`
`187`	`187`	`cp_cpattern_element(Cpattern o)`
`188`	`188`	`{`
`189`	`189`	`Cpattern n = zalloc(sizeof(struct cpattern));`
Original file line number	Diff line number	Diff line change
`@@ -1961,7 +1961,7 @@ asklist(void)`
`1961`	`1961`	`}`
`1962`	`1962`
`1963`	`1963`	`/**/`
`1964`		`-mod_export int`
	`1964`	`+static int`
`1965`	`1965`	`printlist(int over, CLPrintFunc printm, int showall)`
`1966`	`1966`	`{`
`1967`	`1967`	`Cmgroup g;`
Original file line number	Diff line number	Diff line change
`@@ -1500,7 +1500,7 @@ default_bindings(void)`
`1500`	`1500`	`*/`
`1501`	`1501`
`1502`	`1502`	`/**/`
`1503`		`-mod_export ZLE_INT_T`
	`1503`	`+static ZLE_INT_T`
`1504`	`1504`	`getrestchar_keybuf(void)`
`1505`	`1505`	`{`
`1506`	`1506`	`char c;`
Original file line number	Diff line number	Diff line change
`@@ -1539,7 +1539,7 @@ addsuffix(int tp, int flags, ZLE_STRING_T chars, int lenstr, int lensuf)`
`1539`	`1539`	`/* Same as addsuffix, but from metafied string */`
`1540`	`1540`
`1541`	`1541`	`/**/`
`1542`		`-mod_export void`
	`1542`	`+static void`
`1543`	`1543`	`addsuffixstring(int tp, int flags, char *chars, int lensuf)`
`1544`	`1544`	`{`
`1545`	`1545`	`int slen, alloclen;`
Original file line number	Diff line number	Diff line change
`@@ -4828,7 +4828,7 @@ getoutput(char *cmd, int qt)`
`4828`	`4828`	`*/`
`4829`	`4829`
`4830`	`4830`	`/**/`
`4831`		`-mod_export LinkList`
	`4831`	`+static LinkList`
`4832`	`4832`	`readoutput(int in, int qt, int *readerror)`
`4833`	`4833`	`{`
`4834`	`4834`	`LinkList ret;`
Original file line number	Diff line number	Diff line change
`@@ -2417,7 +2417,7 @@ convamps(char out, char in, int inlen)`
`2417`	`2417`	`}`
`2418`	`2418`
`2419`	`2419`	`/**/`
`2420`		`-mod_export void`
	`2420`	`+static void`
`2421`	`2421`	`checkcurline(Histent he)`
`2422`	`2422`	`{`
`2423`	`2423`	`if (he->histnum == curhist && (histactive & HA_ACTIVE)) {`