Commit 674bb26172fbe09cab18a4240e0ef58754077283

Authored by blueswir1
1 parent 98448f58

Add some missing static qualifiers

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5363 c046a42c-6fe2-441c-8c8c-71466251a162
curses_keys.h
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 37
38 #define CURSES_KEYS KEY_MAX /* KEY_MAX defined in <curses.h> */ 38 #define CURSES_KEYS KEY_MAX /* KEY_MAX defined in <curses.h> */
39 39
40 -int curses2keycode[CURSES_KEYS] = { 40 +static int curses2keycode[CURSES_KEYS] = {
41 [0 ... (CURSES_KEYS - 1)] = -1, 41 [0 ... (CURSES_KEYS - 1)] = -1,
42 42
43 [0x01b] = 1, /* Escape */ 43 [0x01b] = 1, /* Escape */
@@ -216,7 +216,7 @@ int curses2keycode[CURSES_KEYS] = { @@ -216,7 +216,7 @@ int curses2keycode[CURSES_KEYS] = {
216 216
217 }; 217 };
218 218
219 -int curses2keysym[CURSES_KEYS] = { 219 +static int curses2keysym[CURSES_KEYS] = {
220 [0 ... (CURSES_KEYS - 1)] = -1, 220 [0 ... (CURSES_KEYS - 1)] = -1,
221 221
222 ['\n'] = '\n', 222 ['\n'] = '\n',
hw/e1000.c
@@ -783,7 +783,7 @@ e1000_mmio_readw(void *opaque, target_phys_addr_t addr) @@ -783,7 +783,7 @@ e1000_mmio_readw(void *opaque, target_phys_addr_t addr)
783 (8 * (addr & 3))) & 0xffff; 783 (8 * (addr & 3))) & 0xffff;
784 } 784 }
785 785
786 -int mac_regtosave[] = { 786 +static int mac_regtosave[] = {
787 CTRL, EECD, EERD, GPRC, GPTC, ICR, ICS, IMC, IMS, 787 CTRL, EECD, EERD, GPRC, GPTC, ICR, ICS, IMC, IMS,
788 LEDCTL, MANC, MDIC, MPC, PBA, RCTL, RDBAH, RDBAL, RDH, 788 LEDCTL, MANC, MDIC, MPC, PBA, RCTL, RDBAH, RDBAL, RDH,
789 RDLEN, RDT, STATUS, SWSM, TCTL, TDBAH, TDBAL, TDH, TDLEN, 789 RDLEN, RDT, STATUS, SWSM, TCTL, TDBAH, TDBAL, TDH, TDLEN,
@@ -791,7 +791,7 @@ int mac_regtosave[] = { @@ -791,7 +791,7 @@ int mac_regtosave[] = {
791 }; 791 };
792 enum { MAC_NSAVE = sizeof mac_regtosave/sizeof *mac_regtosave }; 792 enum { MAC_NSAVE = sizeof mac_regtosave/sizeof *mac_regtosave };
793 793
794 -struct { 794 +static struct {
795 int size; 795 int size;
796 int array0; 796 int array0;
797 } mac_regarraystosave[] = { {32, RA}, {128, MTA} }; 797 } mac_regarraystosave[] = { {32, RA}, {128, MTA} };
slirp/if.c
@@ -15,7 +15,7 @@ struct mbuf *next_m; /* Pointer to next mbuf to output */ @@ -15,7 +15,7 @@ struct mbuf *next_m; /* Pointer to next mbuf to output */
15 15
16 #define ifs_init(ifm) ((ifm)->ifs_next = (ifm)->ifs_prev = (ifm)) 16 #define ifs_init(ifm) ((ifm)->ifs_next = (ifm)->ifs_prev = (ifm))
17 17
18 -void 18 +static void
19 ifs_insque(struct mbuf *ifm, struct mbuf *ifmhead) 19 ifs_insque(struct mbuf *ifm, struct mbuf *ifmhead)
20 { 20 {
21 ifm->ifs_next = ifmhead->ifs_next; 21 ifm->ifs_next = ifmhead->ifs_next;
@@ -24,7 +24,7 @@ ifs_insque(struct mbuf *ifm, struct mbuf *ifmhead) @@ -24,7 +24,7 @@ ifs_insque(struct mbuf *ifm, struct mbuf *ifmhead)
24 ifm->ifs_next->ifs_prev = ifm; 24 ifm->ifs_next->ifs_prev = ifm;
25 } 25 }
26 26
27 -void 27 +static void
28 ifs_remque(struct mbuf *ifm) 28 ifs_remque(struct mbuf *ifm)
29 { 29 {
30 ifm->ifs_prev->ifs_next = ifm->ifs_next; 30 ifm->ifs_prev->ifs_next = ifm->ifs_next;
@@ -5375,7 +5375,7 @@ static struct bt_vlan_s { @@ -5375,7 +5375,7 @@ static struct bt_vlan_s {
5375 } *first_bt_vlan; 5375 } *first_bt_vlan;
5376 5376
5377 /* find or alloc a new bluetooth "VLAN" */ 5377 /* find or alloc a new bluetooth "VLAN" */
5378 -struct bt_scatternet_s *qemu_find_bt_vlan(int id) 5378 +static struct bt_scatternet_s *qemu_find_bt_vlan(int id)
5379 { 5379 {
5380 struct bt_vlan_s **pvlan, *vlan; 5380 struct bt_vlan_s **pvlan, *vlan;
5381 for (vlan = first_bt_vlan; vlan != NULL; vlan = vlan->next) { 5381 for (vlan = first_bt_vlan; vlan != NULL; vlan = vlan->next) {
@@ -6360,7 +6360,7 @@ static int bdrv_fclose(void *opaque) @@ -6360,7 +6360,7 @@ static int bdrv_fclose(void *opaque)
6360 return 0; 6360 return 0;
6361 } 6361 }
6362 6362
6363 -QEMUFile *qemu_fopen_bdrv(BlockDriverState *bs, int64_t offset, int is_writable) 6363 +static QEMUFile *qemu_fopen_bdrv(BlockDriverState *bs, int64_t offset, int is_writable)
6364 { 6364 {
6365 QEMUFileBdrv *s; 6365 QEMUFileBdrv *s;
6366 6366