diff options
author | Justus Winter <justus@gnupg.org> | 2017-08-23 16:14:34 +0200 |
---|---|---|
committer | Justus Winter <justus@gnupg.org> | 2017-08-23 19:01:14 +0200 |
commit | bdbaf9d19c68ded3a9c3c62585f47fdc38841eb5 (patch) | |
tree | 88305ffb5af55b9ac0477b4ec48777ea6a43db25 /libbpf | |
parent | 61d5aee1ce02888e78eab4ed85a9c8e631006d7b (diff) |
Drop the register qualifier.
* console/display.c: Drop 'register'.
* eth-multiplexer/dev_stat.c: Likewise.
* libbpf/bpf_impl.c: Likewise.
* libbpf/queue.c: Likewise.
* libports/manage-multithread.c: Likewise.
* libports/manage-one-thread.c: Likewise.
Diffstat (limited to 'libbpf')
-rw-r--r-- | libbpf/bpf_impl.c | 30 | ||||
-rw-r--r-- | libbpf/queue.c | 24 |
2 files changed, 27 insertions, 27 deletions
diff --git a/libbpf/bpf_impl.c b/libbpf/bpf_impl.c index 03a2a531..a419123a 100644 --- a/libbpf/bpf_impl.c +++ b/libbpf/bpf_impl.c @@ -62,11 +62,11 @@ bpf_do_filter(net_rcv_port_t infp, char *p, unsigned int wirelen, char *header, unsigned int hlen, net_hash_entry_t **hash_headpp, net_hash_entry_t *entpp) { - register bpf_insn_t pc, pc_end; - register unsigned int buflen; + bpf_insn_t pc, pc_end; + unsigned int buflen; - register unsigned long A, X; - register int k; + unsigned long A, X; + int k; unsigned int mem[BPF_MEMWORDS]; /* Generic pointer to either HEADER or P according to the specified offset. */ @@ -350,8 +350,8 @@ load_byte: int bpf_validate(bpf_insn_t f, int bytes, bpf_insn_t *match) { - register int i, j, len; - register bpf_insn_t p; + int i, j, len; + bpf_insn_t p; len = BPF_BYTES2LEN(bytes); @@ -367,7 +367,7 @@ bpf_validate(bpf_insn_t f, int bytes, bpf_insn_t *match) */ p = &f[i]; if (BPF_CLASS(p->code) == BPF_JMP) { - register int from = i + 1; + int from = i + 1; if (BPF_OP(p->code) == BPF_JA) { if (from + p->k >= len) @@ -421,7 +421,7 @@ bpf_validate(bpf_insn_t f, int bytes, bpf_insn_t *match) int bpf_eq (bpf_insn_t f1, bpf_insn_t f2, int bytes) { - register int count; + int count; count = BPF_BYTES2LEN(bytes); for (; count--; f1++, f2++) { @@ -438,7 +438,7 @@ bpf_eq (bpf_insn_t f1, bpf_insn_t f2, int bytes) unsigned int bpf_hash (int n, unsigned int *keys) { - register unsigned int hval = 0; + unsigned int hval = 0; while (n--) { hval += *keys++; @@ -451,8 +451,8 @@ int bpf_match (net_hash_header_t hash, int n_keys, unsigned int *keys, net_hash_entry_t **hash_headpp, net_hash_entry_t *entpp) { - register net_hash_entry_t head, entp; - register int i; + net_hash_entry_t head, entp; + int i; if (n_keys != hash->n_keys) return FALSE; @@ -527,7 +527,7 @@ hash_ent_remove (if_filter_list_t *ifp, net_hash_header_t hp, int used, void net_free_dead_infp (queue_entry_t dead_infp) { - register net_rcv_port_t infp, nextfp; + net_rcv_port_t infp, nextfp; for (infp = (net_rcv_port_t) dead_infp; infp != 0; infp = nextfp) { nextfp = (net_rcv_port_t) queue_next(&infp->input); @@ -547,7 +547,7 @@ net_free_dead_infp (queue_entry_t dead_infp) void net_free_dead_entp (queue_entry_t dead_entp) { - register net_hash_entry_t entp, nextentp; + net_hash_entry_t entp, nextentp; for (entp = (net_hash_entry_t)dead_entp; entp != 0; entp = nextentp) { nextentp = (net_hash_entry_t) queue_next(&entp->chain); @@ -570,10 +570,10 @@ net_set_filter(if_filter_list_t *ifp, mach_port_t rcv_port, int priority, { int filter_bytes; bpf_insn_t match; - register net_rcv_port_t infp, my_infp; + net_rcv_port_t infp, my_infp; net_rcv_port_t nextfp; net_hash_header_t hhp; - register net_hash_entry_t entp, hash_entp=NULL; + net_hash_entry_t entp, hash_entp=NULL; net_hash_entry_t *head, nextentp; queue_entry_t dead_infp, dead_entp; int i; diff --git a/libbpf/queue.c b/libbpf/queue.c index 33234344..1288a0bb 100644 --- a/libbpf/queue.c +++ b/libbpf/queue.c @@ -35,8 +35,8 @@ * Insert element at head of queue. */ void enqueue_head( - register queue_t que, - register queue_entry_t elt) + queue_t que, + queue_entry_t elt) { elt->next = que->next; elt->prev = que; @@ -48,8 +48,8 @@ void enqueue_head( * Insert element at tail of queue. */ void enqueue_tail( - register queue_t que, - register queue_entry_t elt) + queue_t que, + queue_entry_t elt) { elt->next = que; elt->prev = que->prev; @@ -61,9 +61,9 @@ void enqueue_tail( * Remove and return element at head of queue. */ queue_entry_t dequeue_head( - register queue_t que) + queue_t que) { - register queue_entry_t elt; + queue_entry_t elt; if (que->next == que) return((queue_entry_t)0); @@ -78,9 +78,9 @@ queue_entry_t dequeue_head( * Remove and return element at tail of queue. */ queue_entry_t dequeue_tail( - register queue_t que) + queue_t que) { - register queue_entry_t elt; + queue_entry_t elt; if (que->prev == que) return((queue_entry_t)0); @@ -100,7 +100,7 @@ queue_entry_t dequeue_tail( /*ARGSUSED*/ void remqueue( queue_t que, - register queue_entry_t elt) + queue_entry_t elt) { elt->next->prev = elt->prev; elt->prev->next = elt->next; @@ -111,8 +111,8 @@ void remqueue( * package. */ void insque( - register struct queue_entry *entry, - register struct queue_entry *pred) + struct queue_entry *entry, + struct queue_entry *pred) { entry->next = pred->next; entry->prev = pred; @@ -122,7 +122,7 @@ void insque( struct queue_entry *remque( - register struct queue_entry *elt) + struct queue_entry *elt) { (elt->next)->prev = elt->prev; (elt->prev)->next = elt->next; |