aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorblueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>2008-09-30 18:18:27 +0000
committerblueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>2008-09-30 18:18:27 +0000
commit674bb26172fbe09cab18a4240e0ef58754077283 (patch)
treece5bdb9a6142a81ec9d1e689ccc0a8efe44e132e
parent98448f58c10033a0f7fcd0673cce4626506403fa (diff)
Add some missing static qualifiers
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5363 c046a42c-6fe2-441c-8c8c-71466251a162
-rw-r--r--curses_keys.h4
-rw-r--r--hw/e1000.c4
-rw-r--r--slirp/if.c4
-rw-r--r--vl.c4
4 files changed, 8 insertions, 8 deletions
diff --git a/curses_keys.h b/curses_keys.h
index 27f9cd8a0c..10bdf8b5fe 100644
--- a/curses_keys.h
+++ b/curses_keys.h
@@ -37,7 +37,7 @@
#define CURSES_KEYS KEY_MAX /* KEY_MAX defined in <curses.h> */
-int curses2keycode[CURSES_KEYS] = {
+static int curses2keycode[CURSES_KEYS] = {
[0 ... (CURSES_KEYS - 1)] = -1,
[0x01b] = 1, /* Escape */
@@ -216,7 +216,7 @@ int curses2keycode[CURSES_KEYS] = {
};
-int curses2keysym[CURSES_KEYS] = {
+static int curses2keysym[CURSES_KEYS] = {
[0 ... (CURSES_KEYS - 1)] = -1,
['\n'] = '\n',
diff --git a/hw/e1000.c b/hw/e1000.c
index a8dcd1ad6c..8209f54086 100644
--- a/hw/e1000.c
+++ b/hw/e1000.c
@@ -783,7 +783,7 @@ e1000_mmio_readw(void *opaque, target_phys_addr_t addr)
(8 * (addr & 3))) & 0xffff;
}
-int mac_regtosave[] = {
+static int mac_regtosave[] = {
CTRL, EECD, EERD, GPRC, GPTC, ICR, ICS, IMC, IMS,
LEDCTL, MANC, MDIC, MPC, PBA, RCTL, RDBAH, RDBAL, RDH,
RDLEN, RDT, STATUS, SWSM, TCTL, TDBAH, TDBAL, TDH, TDLEN,
@@ -791,7 +791,7 @@ int mac_regtosave[] = {
};
enum { MAC_NSAVE = sizeof mac_regtosave/sizeof *mac_regtosave };
-struct {
+static struct {
int size;
int array0;
} mac_regarraystosave[] = { {32, RA}, {128, MTA} };
diff --git a/slirp/if.c b/slirp/if.c
index 31c2112354..0e10f3e6d9 100644
--- a/slirp/if.c
+++ b/slirp/if.c
@@ -15,7 +15,7 @@ struct mbuf *next_m; /* Pointer to next mbuf to output */
#define ifs_init(ifm) ((ifm)->ifs_next = (ifm)->ifs_prev = (ifm))
-void
+static void
ifs_insque(struct mbuf *ifm, struct mbuf *ifmhead)
{
ifm->ifs_next = ifmhead->ifs_next;
@@ -24,7 +24,7 @@ ifs_insque(struct mbuf *ifm, struct mbuf *ifmhead)
ifm->ifs_next->ifs_prev = ifm;
}
-void
+static void
ifs_remque(struct mbuf *ifm)
{
ifm->ifs_prev->ifs_next = ifm->ifs_next;
diff --git a/vl.c b/vl.c
index dec8d4f499..9effa676d2 100644
--- a/vl.c
+++ b/vl.c
@@ -5375,7 +5375,7 @@ static struct bt_vlan_s {
} *first_bt_vlan;
/* find or alloc a new bluetooth "VLAN" */
-struct bt_scatternet_s *qemu_find_bt_vlan(int id)
+static struct bt_scatternet_s *qemu_find_bt_vlan(int id)
{
struct bt_vlan_s **pvlan, *vlan;
for (vlan = first_bt_vlan; vlan != NULL; vlan = vlan->next) {
@@ -6360,7 +6360,7 @@ static int bdrv_fclose(void *opaque)
return 0;
}
-QEMUFile *qemu_fopen_bdrv(BlockDriverState *bs, int64_t offset, int is_writable)
+static QEMUFile *qemu_fopen_bdrv(BlockDriverState *bs, int64_t offset, int is_writable)
{
QEMUFileBdrv *s;