Make some private symbols private.

davidchisnall · davidchisnall · commit abf629b1f771 · 2019-01-02T17:40:59.000Z
diff --git a/arc.m b/arc.m
@@ -107,8 +107,8 @@ - (void)release;
 	return tls;
 #endif
 }
-int count = 0;
-int poolCount = 0;
+static int count = 0;
+static int poolCount = 0;
 static inline void release(id obj);
 
 /**
diff --git a/class_table.c b/class_table.c
@@ -311,7 +311,7 @@ PRIVATE void objc_resolve_class_links(void)
 		}
 	} while (resolvedClass);
 }
-void __objc_resolve_class_links(void)
+PRIVATE void __objc_resolve_class_links(void)
 {
 	static BOOL warned = NO;
 	if (!warned)
diff --git a/eh_personality.c b/eh_personality.c
@@ -533,19 +533,19 @@ struct thread_data
 #ifdef NO_PTHREADS
 static __thread struct thread_data thread_data;
 #else
-void clean_tls(void *td)
+static void clean_tls(void *td)
 {
 	struct thread_data *data = td;
 }
 
 static pthread_key_t key;
-void init_key(void)
+static void init_key(void)
 {
 	pthread_key_create(&key, clean_tls);
 }
 #endif
 
-struct thread_data *get_thread_data(void)
+static struct thread_data *get_thread_data(void)
 {
 #ifndef NO_PTHREADS
 	static pthread_once_t once_control = PTHREAD_ONCE_INIT;
@@ -566,7 +566,7 @@ struct thread_data *get_thread_data(void)
 #endif
 }
 
-struct thread_data *get_thread_data_fast(void)
+static struct thread_data *get_thread_data_fast(void)
 {
 #ifndef NO_PTHREADS
 	struct thread_data *td = pthread_getspecific(key);
diff --git a/hash_table.h b/hash_table.h
@@ -116,7 +116,7 @@ typedef struct PREFIX(_table_struct)
 	struct PREFIX(_table_cell_struct) *table;
 } PREFIX(_table);
 
-struct PREFIX(_table_cell_struct) *PREFIX(alloc_cells)(PREFIX(_table) *table, int count)
+static struct PREFIX(_table_cell_struct) *PREFIX(alloc_cells)(PREFIX(_table) *table, int count)
 {
 #	if defined(ENABLE_GC) && defined(MAP_TABLE_TYPES_BITMAP)
 	return GC_CALLOC_EXPLICITLY_TYPED(count,
@@ -126,7 +126,7 @@ struct PREFIX(_table_cell_struct) *PREFIX(alloc_cells)(PREFIX(_table) *table, in
 #	endif
 }
 
-PREFIX(_table) *PREFIX(_create)(uint32_t capacity)
+static PREFIX(_table) *PREFIX(_create)(uint32_t capacity)
 {
 	PREFIX(_table) *table = CALLOC(1, sizeof(PREFIX(_table)));
 #	ifndef MAP_TABLE_NO_LOCK
@@ -143,7 +143,7 @@ PREFIX(_table) *PREFIX(_create)(uint32_t capacity)
 	return table;
 }
 
-void PREFIX(_initialize)(PREFIX(_table) **table, uint32_t capacity)
+static void PREFIX(_initialize)(PREFIX(_table) **table, uint32_t capacity)
 {
 #ifdef ENABLE_GC
 	GC_add_roots(table, table+1);
diff --git a/protocol.c b/protocol.c
@@ -31,7 +31,7 @@ static int protocol_hash(const struct objc_protocol *protocol)
 static protocol_table *known_protocol_table;
 mutex_t protocol_table_lock;
 
-void init_protocol_table(void)
+PRIVATE void init_protocol_table(void)
 {
 	protocol_initialize(&known_protocol_table, 128);
 	INIT_LOCK(protocol_table_lock);
diff --git a/sarray2.c b/sarray2.c
@@ -18,7 +18,7 @@ const static SparseArray EmptyArray24 = { 24, 0, .data[0 ... 255] = (void*)&Empt
 #define base_shift 8
 #define base_mask ((1<<base_shift) - 1)
 
-void *EmptyChildForShift(uint32_t shift)
+static void *EmptyChildForShift(uint32_t shift)
 {
 	switch(shift)
 	{

Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,7 @@ PRIVATE void objc_resolve_class_links(void)`
`311`	`311`	`}`
`312`	`312`	`} while (resolvedClass);`
`313`	`313`	`}`
`314`		`-void __objc_resolve_class_links(void)`
	`314`	`+PRIVATE void __objc_resolve_class_links(void)`
`315`	`315`	`{`
`316`	`316`	`static BOOL warned = NO;`
`317`	`317`	`if (!warned)`
Original file line number	Diff line number	Diff line change
`@@ -533,19 +533,19 @@ struct thread_data`
`533`	`533`	`#ifdef NO_PTHREADS`
`534`	`534`	`static __thread struct thread_data thread_data;`
`535`	`535`	`#else`
`536`		`-void clean_tls(void *td)`
	`536`	`+static void clean_tls(void *td)`
`537`	`537`	`{`
`538`	`538`	`struct thread_data *data = td;`
`539`	`539`	`}`
`540`	`540`
`541`	`541`	`static pthread_key_t key;`
`542`		`-void init_key(void)`
	`542`	`+static void init_key(void)`
`543`	`543`	`{`
`544`	`544`	`pthread_key_create(&key, clean_tls);`
`545`	`545`	`}`
`546`	`546`	`#endif`
`547`	`547`
`548`		`-struct thread_data *get_thread_data(void)`
	`548`	`+static struct thread_data *get_thread_data(void)`
`549`	`549`	`{`
`550`	`550`	`#ifndef NO_PTHREADS`
`551`	`551`	`static pthread_once_t once_control = PTHREAD_ONCE_INIT;`
`@@ -566,7 +566,7 @@ struct thread_data *get_thread_data(void)`
`566`	`566`	`#endif`
`567`	`567`	`}`
`568`	`568`
`569`		`-struct thread_data *get_thread_data_fast(void)`
	`569`	`+static struct thread_data *get_thread_data_fast(void)`
`570`	`570`	`{`
`571`	`571`	`#ifndef NO_PTHREADS`
`572`	`572`	`struct thread_data *td = pthread_getspecific(key);`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ typedef struct PREFIX(_table_struct)`
`116`	`116`	`struct PREFIX(_table_cell_struct) *table;`
`117`	`117`	`} PREFIX(_table);`
`118`	`118`
`119`		`-struct PREFIX(_table_cell_struct) PREFIX(alloc_cells)(PREFIX(_table) table, int count)`
	`119`	`+static struct PREFIX(_table_cell_struct) PREFIX(alloc_cells)(PREFIX(_table) table, int count)`
`120`	`120`	`{`
`121`	`121`	`# if defined(ENABLE_GC) && defined(MAP_TABLE_TYPES_BITMAP)`
`122`	`122`	`return GC_CALLOC_EXPLICITLY_TYPED(count,`
`@@ -126,7 +126,7 @@ struct PREFIX(_table_cell_struct) PREFIX(alloc_cells)(PREFIX(_table) table, in`
`126`	`126`	`# endif`
`127`	`127`	`}`
`128`	`128`
`129`		`-PREFIX(_table) *PREFIX(_create)(uint32_t capacity)`
	`129`	`+static PREFIX(_table) *PREFIX(_create)(uint32_t capacity)`
`130`	`130`	`{`
`131`	`131`	`PREFIX(_table) *table = CALLOC(1, sizeof(PREFIX(_table)));`
`132`	`132`	`# ifndef MAP_TABLE_NO_LOCK`
`@@ -143,7 +143,7 @@ PREFIX(_table) *PREFIX(_create)(uint32_t capacity)`
`143`	`143`	`return table;`
`144`	`144`	`}`
`145`	`145`
`146`		`-void PREFIX(_initialize)(PREFIX(_table) **table, uint32_t capacity)`
	`146`	`+static void PREFIX(_initialize)(PREFIX(_table) **table, uint32_t capacity)`
`147`	`147`	`{`
`148`	`148`	`#ifdef ENABLE_GC`
`149`	`149`	`GC_add_roots(table, table+1);`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ static int protocol_hash(const struct objc_protocol *protocol)`
`31`	`31`	`static protocol_table *known_protocol_table;`
`32`	`32`	`mutex_t protocol_table_lock;`
`33`	`33`
`34`		`-void init_protocol_table(void)`
	`34`	`+PRIVATE void init_protocol_table(void)`
`35`	`35`	`{`
`36`	`36`	`protocol_initialize(&known_protocol_table, 128);`
`37`	`37`	`INIT_LOCK(protocol_table_lock);`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ const static SparseArray EmptyArray24 = { 24, 0, .data[0 ... 255] = (void*)&Empt`
`18`	`18`	`#define base_shift 8`
`19`	`19`	`#define base_mask ((1<<base_shift) - 1)`
`20`	`20`
`21`		`-void *EmptyChildForShift(uint32_t shift)`
	`21`	`+static void *EmptyChildForShift(uint32_t shift)`
`22`	`22`	`{`
`23`	`23`	`switch(shift)`
`24`	`24`	`{`