Skip to content

Commit 44f5a72

Browse files
williamhwilliamh
committed
remove hidden-visibility.h
I am removing this on the advice of a member of the Gentoo toolchain team. It was explained to me that this doesn't offer any significant benefits to OpenRC. If anyone ffeels differently, please open a pull request reverting this and adding an explanation of what it does and how to know which functions to mark hidden in the future. This fixes #301.
1 parent 0d37897 commit 44f5a72

8 files changed

Lines changed: 0 additions & 202 deletions

File tree

‎src/includes/hidden-visibility.h‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎src/libeinfo/libeinfo.c‎

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -39,34 +39,6 @@ const char libeinfo_copyright[] = "Copyright (c) 2007-2008 Roy Marples";
3939

4040
#include "einfo.h"
4141
#include "helpers.h"
42-
#include "hidden-visibility.h"
43-
44-
hidden_proto(ecolor)
45-
hidden_proto(ebegin)
46-
hidden_proto(ebeginv)
47-
hidden_proto(ebracket)
48-
hidden_proto(eend)
49-
hidden_proto(eendv)
50-
hidden_proto(eerror)
51-
hidden_proto(eerrorn)
52-
hidden_proto(eerrorx)
53-
hidden_proto(eindent)
54-
hidden_proto(eindentv)
55-
hidden_proto(einfo)
56-
hidden_proto(einfon)
57-
hidden_proto(einfov)
58-
hidden_proto(einfovn)
59-
hidden_proto(elog)
60-
hidden_proto(eoutdent)
61-
hidden_proto(eoutdentv)
62-
hidden_proto(eprefix)
63-
hidden_proto(ewarn)
64-
hidden_proto(ewarnn)
65-
hidden_proto(ewarnv)
66-
hidden_proto(ewarnvn)
67-
hidden_proto(ewarnx)
68-
hidden_proto(ewend)
69-
hidden_proto(ewendv)
7042

7143
/* Incase we cannot work out how many columns from ioctl, supply a default */
7244
#define DEFAULT_COLS 80
@@ -510,7 +482,6 @@ eprefix(const char *EINFO_RESTRICT prefix)
510482
{
511483
_eprefix = prefix;
512484
}
513-
hidden_def(eprefix)
514485

515486
static void EINFO_PRINTF(2, 0)
516487
elogv(int level, const char *EINFO_RESTRICT fmt, va_list ap)
@@ -537,7 +508,6 @@ elog(int level, const char *EINFO_RESTRICT fmt, ...)
537508
elogv(level, fmt, ap);
538509
va_end(ap);
539510
}
540-
hidden_def(elog)
541511

542512
static int
543513
_eindent(FILE * EINFO_RESTRICT stream)
@@ -576,7 +546,6 @@ _ecolor(FILE * EINFO_RESTRICT f, ECOLOR color)
576546
return ecolors_str[i];
577547
return "";
578548
}
579-
hidden_def(ecolor)
580549

581550
const char *
582551
ecolor(ECOLOR color)
@@ -643,7 +612,6 @@ einfon(const char *EINFO_RESTRICT fmt, ...)
643612
LASTCMD("einfon");
644613
return retval;
645614
}
646-
hidden_def(einfon)
647615

648616
int
649617
ewarnn(const char *EINFO_RESTRICT fmt, ...)
@@ -659,7 +627,6 @@ ewarnn(const char *EINFO_RESTRICT fmt, ...)
659627
LASTCMD("ewarnn");
660628
return retval;
661629
}
662-
hidden_def(ewarnn)
663630

664631
int
665632
eerrorn(const char *EINFO_RESTRICT fmt, ...)
@@ -675,7 +642,6 @@ eerrorn(const char *EINFO_RESTRICT fmt, ...)
675642
LASTCMD("errorn");
676643
return retval;
677644
}
678-
hidden_def(eerrorn)
679645

680646
int
681647
einfo(const char *EINFO_RESTRICT fmt, ...)
@@ -692,7 +658,6 @@ einfo(const char *EINFO_RESTRICT fmt, ...)
692658
LASTCMD("einfo");
693659
return retval;
694660
}
695-
hidden_def(einfo)
696661

697662
int
698663
ewarn(const char *EINFO_RESTRICT fmt, ...)
@@ -710,7 +675,6 @@ ewarn(const char *EINFO_RESTRICT fmt, ...)
710675
LASTCMD("ewarn");
711676
return retval;
712677
}
713-
hidden_def(ewarn)
714678

715679
void
716680
ewarnx(const char *EINFO_RESTRICT fmt, ...)
@@ -727,7 +691,6 @@ ewarnx(const char *EINFO_RESTRICT fmt, ...)
727691
}
728692
exit(EXIT_FAILURE);
729693
}
730-
hidden_def(ewarnx)
731694

732695
int
733696
eerror(const char *EINFO_RESTRICT fmt, ...)
@@ -745,7 +708,6 @@ eerror(const char *EINFO_RESTRICT fmt, ...)
745708
LASTCMD("eerror");
746709
return retval;
747710
}
748-
hidden_def(eerror)
749711

750712
void
751713
eerrorx(const char *EINFO_RESTRICT fmt, ...)
@@ -761,7 +723,6 @@ eerrorx(const char *EINFO_RESTRICT fmt, ...)
761723
}
762724
exit(EXIT_FAILURE);
763725
}
764-
hidden_def(eerrorx)
765726

766727
int
767728
ebegin(const char *EINFO_RESTRICT fmt, ...)
@@ -780,7 +741,6 @@ ebegin(const char *EINFO_RESTRICT fmt, ...)
780741
LASTCMD("ebegin");
781742
return retval;
782743
}
783-
hidden_def(ebegin)
784744

785745
static void
786746
_eend(FILE * EINFO_RESTRICT fp, int col, ECOLOR color, const char *msg)
@@ -854,7 +814,6 @@ eend(int retval, const char *EINFO_RESTRICT fmt, ...)
854814
LASTCMD("eend");
855815
return retval;
856816
}
857-
hidden_def(eend)
858817

859818
int
860819
ewend(int retval, const char *EINFO_RESTRICT fmt, ...)
@@ -869,14 +828,12 @@ ewend(int retval, const char *EINFO_RESTRICT fmt, ...)
869828
LASTCMD("ewend");
870829
return retval;
871830
}
872-
hidden_def(ewend)
873831

874832
void
875833
ebracket(int col, ECOLOR color, const char *msg)
876834
{
877835
_eend(stdout, col, color, msg);
878836
}
879-
hidden_def(ebracket)
880837

881838
void
882839
eindent(void)
@@ -898,7 +855,6 @@ eindent(void)
898855
setenv("EINFO_INDENT", num, 1);
899856
free(num);
900857
}
901-
hidden_def(eindent)
902858

903859
void eoutdent(void)
904860
{
@@ -924,7 +880,6 @@ void eoutdent(void)
924880
}
925881
errno = serrno;
926882
}
927-
hidden_def(eoutdent)
928883

929884
int
930885
einfovn(const char *EINFO_RESTRICT fmt, ...)
@@ -940,7 +895,6 @@ einfovn(const char *EINFO_RESTRICT fmt, ...)
940895
LASTCMD("einfovn");
941896
return retval;
942897
}
943-
hidden_def(einfovn)
944898

945899
int
946900
ewarnvn(const char *EINFO_RESTRICT fmt, ...)
@@ -956,7 +910,6 @@ ewarnvn(const char *EINFO_RESTRICT fmt, ...)
956910
LASTCMD("ewarnvn");
957911
return retval;
958912
}
959-
hidden_def(ewarnvn)
960913

961914
int
962915
einfov(const char *EINFO_RESTRICT fmt, ...)
@@ -973,7 +926,6 @@ einfov(const char *EINFO_RESTRICT fmt, ...)
973926
LASTCMD("einfov");
974927
return retval;
975928
}
976-
hidden_def(einfov)
977929

978930
int
979931
ewarnv(const char *EINFO_RESTRICT fmt, ...)
@@ -990,7 +942,6 @@ ewarnv(const char *EINFO_RESTRICT fmt, ...)
990942
LASTCMD("ewarnv");
991943
return retval;
992944
}
993-
hidden_def(ewarnv)
994945

995946
int
996947
ebeginv(const char *EINFO_RESTRICT fmt, ...)
@@ -1010,7 +961,6 @@ ebeginv(const char *EINFO_RESTRICT fmt, ...)
1010961
LASTCMD("ebeginv");
1011962
return retval;
1012963
}
1013-
hidden_def(ebeginv)
1014964

1015965
int
1016966
eendv(int retval, const char *EINFO_RESTRICT fmt, ...)
@@ -1025,7 +975,6 @@ eendv(int retval, const char *EINFO_RESTRICT fmt, ...)
1025975
LASTCMD("eendv");
1026976
return retval;
1027977
}
1028-
hidden_def(eendv)
1029978

1030979
int
1031980
ewendv(int retval, const char *EINFO_RESTRICT fmt, ...)
@@ -1040,20 +989,17 @@ ewendv(int retval, const char *EINFO_RESTRICT fmt, ...)
1040989
LASTCMD("ewendv");
1041990
return retval;
1042991
}
1043-
hidden_def(ewendv)
1044992

1045993
void
1046994
eindentv(void)
1047995
{
1048996
if (is_verbose())
1049997
eindent();
1050998
}
1051-
hidden_def(eindentv)
1052999

10531000
void
10541001
eoutdentv(void)
10551002
{
10561003
if (is_verbose())
10571004
eoutdent();
10581005
}
1059-
hidden_def(eoutdentv)

‎src/librc/librc-daemon.c‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,6 @@ rc_find_pids(const char *exec, const char *const *argv, uid_t uid, pid_t pid)
208208
closedir(procdir);
209209
return pids;
210210
}
211-
librc_hidden_def(rc_find_pids)
212211

213212
#elif BSD
214213

@@ -313,7 +312,6 @@ rc_find_pids(const char *exec, const char *const *argv, uid_t uid, pid_t pid)
313312

314313
return pids;
315314
}
316-
librc_hidden_def(rc_find_pids)
317315

318316
#else
319317
# error "Platform not supported!"
@@ -455,7 +453,6 @@ rc_service_daemon_set(const char *service, const char *exec,
455453
free(dirpath);
456454
return retval;
457455
}
458-
librc_hidden_def(rc_service_daemon_set)
459456

460457
bool
461458
rc_service_started_daemon(const char *service,
@@ -495,7 +492,6 @@ rc_service_started_daemon(const char *service,
495492
free(dirpath);
496493
return retval;
497494
}
498-
librc_hidden_def(rc_service_started_daemon)
499495

500496
bool
501497
rc_service_daemons_crashed(const char *service)
@@ -653,4 +649,3 @@ rc_service_daemons_crashed(const char *service)
653649

654650
return retval;
655651
}
656-
librc_hidden_def(rc_service_daemons_crashed)

‎src/librc/librc-depend.c‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ rc_deptree_free(RC_DEPTREE *deptree)
7878
}
7979
free(deptree);
8080
}
81-
librc_hidden_def(rc_deptree_free)
8281

8382
static RC_DEPINFO *
8483
get_depinfo(const RC_DEPTREE *deptree, const char *service)
@@ -109,7 +108,6 @@ RC_DEPTREE *
109108
rc_deptree_load(void) {
110109
return rc_deptree_load_file(RC_DEPTREE_CACHE);
111110
}
112-
librc_hidden_def(rc_deptree_load)
113111

114112
RC_DEPTREE *
115113
rc_deptree_load_file(const char *deptree_file)
@@ -173,7 +171,6 @@ rc_deptree_load_file(const char *deptree_file)
173171

174172
return deptree;
175173
}
176-
librc_hidden_def(rc_deptree_load_file)
177174

178175
static bool
179176
valid_service(const char *runlevel, const char *service, const char *type)
@@ -459,7 +456,6 @@ rc_deptree_depend(const RC_DEPTREE *deptree,
459456
rc_stringlist_add(svcs, svc->value);
460457
return svcs;
461458
}
462-
librc_hidden_def(rc_deptree_depend)
463459

464460
RC_STRINGLIST *
465461
rc_deptree_depends(const RC_DEPTREE *deptree,
@@ -487,7 +483,6 @@ rc_deptree_depends(const RC_DEPTREE *deptree,
487483
rc_stringlist_free(visited);
488484
return sorted;
489485
}
490-
librc_hidden_def(rc_deptree_depends)
491486

492487
RC_STRINGLIST *
493488
rc_deptree_order(const RC_DEPTREE *deptree, const char *runlevel, int options)
@@ -543,7 +538,6 @@ rc_deptree_order(const RC_DEPTREE *deptree, const char *runlevel, int options)
543538
rc_stringlist_free(types);
544539
return services;
545540
}
546-
librc_hidden_def(rc_deptree_order)
547541

548542

549543
/* Given a time, recurse the target path to find out if there are
@@ -633,15 +627,13 @@ rc_newer_than(const char *source, const char *target,
633627

634628
return mtime_check(source, target, true, newest, file);
635629
}
636-
librc_hidden_def(rc_newer_than)
637630

638631
bool
639632
rc_older_than(const char *source, const char *target,
640633
time_t *oldest, char *file)
641634
{
642635
return mtime_check(source, target, false, oldest, file);
643636
}
644-
librc_hidden_def(rc_older_than)
645637

646638
typedef struct deppair
647639
{
@@ -737,7 +729,6 @@ rc_deptree_update_needed(time_t *newest, char *file)
737729

738730
return newer;
739731
}
740-
librc_hidden_def(rc_deptree_update_needed)
741732

742733
/* This is a 7 phase operation
743734
Phase 1 is a shell script which loads each init script and config in turn
@@ -1084,4 +1075,3 @@ rc_deptree_update(void)
10841075
rc_deptree_free(deptree);
10851076
return retval;
10861077
}
1087-
librc_hidden_def(rc_deptree_update)

0 commit comments

Comments
 (0)