commits March 2015

commits@lists.open-mesh.org

1 participants
35 discussions

[alfred] master: alfred: Reduce number of lines with more than 80 chars (2800c13)
by postmaster＠open-mesh.org 16 Mar '15

16 Mar '15

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 2800c130936a3dbbb748532048cd99ab72670408 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Mar 14 12:42:48 2015 +0100 alfred: Reduce number of lines with more than 80 chars Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 2800c130936a3dbbb748532048cd99ab72670408 batadv_query.h | 3 ++- client.c | 4 +++- hash.c | 13 +++++++------ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/batadv_query.h b/batadv_query.h index 6b938ea..8991ee9 100644 --- a/batadv_query.h +++ b/batadv_query.h @@ -24,7 +24,8 @@ #include <stdint.h> #include <netinet/in.h> -struct ether_addr *translate_mac(const char *mesh_iface, struct ether_addr *mac); +struct ether_addr *translate_mac(const char *mesh_iface, + struct ether_addr *mac); uint8_t get_tq(const char *mesh_iface, struct ether_addr *mac); int batadv_interface_check(const char *mesh_iface); int mac_to_ipv6(const struct ether_addr *mac, struct in6_addr *addr); diff --git a/client.c b/client.c index 42dd4ad..f68a5b0 100644 --- a/client.c +++ b/client.c @@ -265,11 +265,13 @@ int alfred_client_change_interface(struct globals *globals) struct alfred_change_interface_v0 *change_interface; int ret, len; char *input, *token, *saveptr; + size_t interface_len; if (unix_sock_open_client(globals)) return -1; - if (strlen(globals->change_interface) > sizeof(change_interface->ifaces)) { + interface_len = strlen(globals->change_interface); + if (interface_len > sizeof(change_interface->ifaces)) { fprintf(stderr, "%s: interface name list too long, not changing\n", __func__); return 0; diff --git a/hash.c b/hash.c index 685842f..a53bb9c 100644 --- a/hash.c +++ b/hash.c @@ -292,12 +292,13 @@ void *hash_remove(struct hashtable_t *hash, void *data) while (hash_it_t.bucket != NULL) { if (hash->compare(hash_it_t.bucket->data, data)) { - int bucket_same; - bucket_same = (hash_it_t.bucket == - hash->table[hash_it_t.index]); - hash_it_t.first_bucket = (bucket_same ? - &hash->table[hash_it_t.index] : - NULL); + struct element_t **first_bucket = NULL; + + if (hash_it_t.bucket == hash->table[hash_it_t.index]) + first_bucket = &hash->table[hash_it_t.index]; + + hash_it_t.first_bucket = first_bucket; + return hash_remove_bucket(hash, &hash_it_t); }

1 0

[alfred] master: alfred: Remove multiple blank lines (9d3f27f)
by postmaster＠open-mesh.org 16 Mar '15

16 Mar '15

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 9d3f27ff47544b65d004766dfaf9cf0d80f44189 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Mar 14 12:42:53 2015 +0100 alfred: Remove multiple blank lines Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 9d3f27ff47544b65d004766dfaf9cf0d80f44189 hash.c | 1 - hash.h | 2 -- packet.h | 1 - recv.c | 4 ---- send.c | 1 - server.c | 4 ---- unix_sock.c | 2 -- 7 files changed, 15 deletions(-) diff --git a/hash.c b/hash.c index 87588cd..20034d6 100644 --- a/hash.c +++ b/hash.c @@ -19,7 +19,6 @@ * */ - #include "hash.h" #include <stdlib.h> #include <stdio.h> diff --git a/hash.h b/hash.h index c7259c1..ee01c0f 100644 --- a/hash.h +++ b/hash.h @@ -21,8 +21,6 @@ #ifndef _BATMAN_HASH_H #define _BATMAN_HASH_H - - typedef int (*hashdata_compare_cb)(void *, void *); typedef int (*hashdata_choose_cb)(void *, int); typedef void (*hashdata_free_cb)(void *); diff --git a/packet.h b/packet.h index 27ee6e5..ceb6c79 100644 --- a/packet.h +++ b/packet.h @@ -158,7 +158,6 @@ struct alfred_change_interface_v0 { char ifaces[IFNAMSIZ * 16]; } __packed; - /** * struct alfred_status_v0 - Status info of a transaction * @header: TLV header describing the complete packet diff --git a/recv.c b/recv.c index e0252eb..02d96c9 100644 --- a/recv.c +++ b/recv.c @@ -287,7 +287,6 @@ process_alfred_announce_master(struct globals *globals, return 0; } - static int process_alfred_request(struct globals *globals, struct interface *interface, struct in6_addr *source, @@ -309,12 +308,10 @@ static int process_alfred_request(struct globals *globals, return 0; } - static int process_alfred_status_txend(struct globals *globals, struct in6_addr *source, struct alfred_status_v0 *request) { - struct transaction_head search, *head; struct transaction_packet *transaction_packet, *safe; struct ether_addr mac; @@ -372,7 +369,6 @@ static int process_alfred_status_txend(struct globals *globals, return 0; } - int recv_alfred_packet(struct globals *globals, struct interface *interface) { uint8_t buf[MAX_PAYLOAD]; diff --git a/send.c b/send.c index 7e0f416..3228d5c 100644 --- a/send.c +++ b/send.c @@ -126,7 +126,6 @@ int push_data(struct globals *globals, struct interface *interface, return 0; } - int sync_data(struct globals *globals) { struct hash_it_t *hashit = NULL; diff --git a/server.c b/server.c index 1a3d876..ab6f4ec 100644 --- a/server.c +++ b/server.c @@ -102,8 +102,6 @@ static int tx_choose(void *d1, int size) return hash % size; } - - static int create_hashes(struct globals *globals) { globals->data_hash = hash_new(128, data_compare, data_choose); @@ -351,5 +349,3 @@ int alfred_server(struct globals *globals) unix_sock_close(globals); return 0; } - - diff --git a/unix_sock.c b/unix_sock.c index 0707252..a3affdc 100644 --- a/unix_sock.c +++ b/unix_sock.c @@ -93,7 +93,6 @@ int unix_sock_open_client(struct globals *globals) return 0; } - static int unix_sock_add_data(struct globals *globals, struct alfred_push_data_v0 *push, int client_sock) @@ -160,7 +159,6 @@ err: return ret; } - static int unix_sock_req_data_reply(struct globals *globals, int client_sock, uint16_t id, uint8_t requested_type) {

1 0

[alfred] master: alfred: Remove double semicolons (dce5230)
by postmaster＠open-mesh.org 16 Mar '15

16 Mar '15

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit dce5230aeaecbddb92d58ae5be5c06a5560f4fdd Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Mar 14 12:42:49 2015 +0100 alfred: Remove double semicolons Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- dce5230aeaecbddb92d58ae5be5c06a5560f4fdd client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client.c b/client.c index f68a5b0..22b8439 100644 --- a/client.c +++ b/client.c @@ -145,7 +145,7 @@ recv_err: status = (struct alfred_status_v0 *)buf; fprintf(stderr, "Request failed with %d\n", status->tx.seqno); - return status->tx.seqno;; + return status->tx.seqno; } int alfred_client_set_data(struct globals *globals)

1 0

[alfred] master: alfred: Remove trailing whitespace at end of line (246afe3)
by postmaster＠open-mesh.org 16 Mar '15

16 Mar '15

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 246afe32bc93e17d863e8b94c80cae4c6ffebdd6 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Mar 14 12:42:50 2015 +0100 alfred: Remove trailing whitespace at end of line Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 246afe32bc93e17d863e8b94c80cae4c6ffebdd6 0 files changed

1 0

[alfred] master: alfred: Remove spaces before ', ' (eaa2969)
by postmaster＠open-mesh.org 16 Mar '15

16 Mar '15

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit eaa2969fe3cb3810e3bd78f6a96d343d685d003c Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Mar 14 12:42:57 2015 +0100 alfred: Remove spaces before ',' Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- eaa2969fe3cb3810e3bd78f6a96d343d685d003c hash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hash.c b/hash.c index 13372fa..4c90a8b 100644 --- a/hash.c +++ b/hash.c @@ -241,7 +241,7 @@ void *hash_find(struct hashtable_t *hash, void *keydata) int index; struct element_t *bucket; - index = hash->choose(keydata , hash->size); + index = hash->choose(keydata, hash->size); bucket = hash->table[index]; while (bucket) {

1 0

[alfred] master: alfred: Remove else and break after return (1946e9b)
by postmaster＠open-mesh.org 16 Mar '15

16 Mar '15

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 1946e9b8bc39b1b5d50349d0b3452ceecda78663 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Mar 14 12:42:52 2015 +0100 alfred: Remove else and break after return Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 1946e9b8bc39b1b5d50349d0b3452ceecda78663 hash.c | 3 +-- main.c | 5 ----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/hash.c b/hash.c index a53bb9c..87588cd 100644 --- a/hash.c +++ b/hash.c @@ -142,10 +142,9 @@ struct hash_it_t *hash_iterate(struct hashtable_t *hash, iter->bucket = (*iter->first_bucket); iter->first_bucket = &hash->table[iter->index]; return iter; - } else { - iter->bucket = NULL; } + iter->bucket = NULL; } } else if (iter->prev_bucket != NULL) { diff --git a/main.c b/main.c index 7ad4625..02553c0 100644 --- a/main.c +++ b/main.c @@ -265,19 +265,14 @@ int main(int argc, char *argv[]) switch (globals->clientmode) { case CLIENT_NONE: return alfred_server(globals); - break; case CLIENT_REQUEST_DATA: return alfred_client_request_data(globals); - break; case CLIENT_SET_DATA: return alfred_client_set_data(globals); - break; case CLIENT_MODESWITCH: return alfred_client_modeswitch(globals); - break; case CLIENT_CHANGE_INTERFACE: return alfred_client_change_interface(globals); - break; } return 0;

1 0

[alfred] master: alfred: Add spaces around operators (d0b22e7)
by postmaster＠open-mesh.org 16 Mar '15

16 Mar '15

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit d0b22e7a3363095c557c4c04db4b9b51416f0743 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Mar 14 12:42:46 2015 +0100 alfred: Add spaces around operators Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- d0b22e7a3363095c557c4c04db4b9b51416f0743 batadv_query.c | 6 +++--- hash.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/batadv_query.c b/batadv_query.c index 473ab40..2a607b9 100644 --- a/batadv_query.c +++ b/batadv_query.c @@ -91,7 +91,7 @@ int ipv6_to_mac(const struct in6_addr *addr, struct ether_addr *mac) int batadv_interface_check(const char *mesh_iface) { char *debugfs_mnt; - char full_path[MAX_PATH+1]; + char full_path[MAX_PATH + 1]; FILE *f; debugfs_mnt = debugfs_mount(NULL); @@ -133,7 +133,7 @@ struct ether_addr *translate_mac(const char *mesh_iface, struct ether_addr *mac) tg_via, tg_originator, } pos; - char full_path[MAX_PATH+1]; + char full_path[MAX_PATH + 1]; char *debugfs_mnt; static struct ether_addr in_mac; struct ether_addr *mac_result, *mac_tmp; @@ -215,7 +215,7 @@ uint8_t get_tq(const char *mesh_iface, struct ether_addr *mac) orig_tqstart, orig_tqvalue, } pos; - char full_path[MAX_PATH+1]; + char full_path[MAX_PATH + 1]; char *debugfs_mnt; static struct ether_addr in_mac; struct ether_addr *mac_tmp; diff --git a/hash.c b/hash.c index 87e8484..685842f 100644 --- a/hash.c +++ b/hash.c @@ -204,7 +204,7 @@ struct hashtable_t *hash_new(int size, hashdata_compare_cb compare, return NULL; hash->size = size; - hash->table = debugMalloc(sizeof(struct element_t *)*size, 303); + hash->table = debugMalloc(sizeof(struct element_t *) * size, 303); if (!hash->table) { debugFree(hash, 1305);

1 0

[alfred] master: alfred: checkpatch - else is not generally useful after a break or return (6c4c883)
by postmaster＠open-mesh.org 16 Mar '15

16 Mar '15

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 6c4c8831eea173db04433d57e835632df4e7dc26 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Mar 14 12:42:47 2015 +0100 alfred: checkpatch - else is not generally useful after a break or return Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 6c4c8831eea173db04433d57e835632df4e7dc26 batadv_query.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/batadv_query.c b/batadv_query.c index 2a607b9..c289b80 100644 --- a/batadv_query.c +++ b/batadv_query.c @@ -269,10 +269,10 @@ uint8_t get_tq(const char *mesh_iface, struct ether_addr *mac) } else if (strlen(token) == 1) { pos = orig_tqvalue; break; - } else { - /* fall through */ - token++; } + + token++; + /* fall through */ case orig_tqvalue: if (token[strlen(token) - 1] != ')') { line_invalid = 1;

1 0

[batman-adv] master: batman-adv: Remove unnecessary ret variable in algo_register (16b4833)
by postmaster＠open-mesh.org 13 Mar '15

13 Mar '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 16b48332e6b02ec2695c2b908f85dd43d82b970d Author: Markus Pargmann <mpa(a)pengutronix.de> Date: Fri Dec 26 12:41:41 2014 +0100 batman-adv: Remove unnecessary ret variable in algo_register Remove ret variable and all jumps. Signed-off-by: Markus Pargmann <mpa(a)pengutronix.de> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 16b48332e6b02ec2695c2b908f85dd43d82b970d main.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/main.c b/main.c index ca7b625..766ab33 100644 --- a/main.c +++ b/main.c @@ -544,17 +544,14 @@ int batadv_algo_register(struct batadv_algo_ops *bat_algo_ops) int batadv_algo_select(struct batadv_priv *bat_priv, char *name) { struct batadv_algo_ops *bat_algo_ops; - int ret = -EINVAL; bat_algo_ops = batadv_algo_get(name); if (!bat_algo_ops) - goto out; + return -EINVAL; bat_priv->bat_algo_ops = bat_algo_ops; - ret = 0; -out: - return ret; + return 0; } int batadv_algo_seq_print_text(struct seq_file *seq, void *offset)

1 0

[batman-adv] master: batman-adv: Remove unnecessary ret variable (32a451a)
by postmaster＠open-mesh.org 13 Mar '15

13 Mar '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 32a451aaa44c74770057a0d9cb72fcf0fbc241f1 Author: Markus Pargmann <mpa(a)pengutronix.de> Date: Fri Dec 26 12:41:40 2014 +0100 batman-adv: Remove unnecessary ret variable We can avoid this indirect return variable by directly returning the error values. Signed-off-by: Markus Pargmann <mpa(a)pengutronix.de> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 32a451aaa44c74770057a0d9cb72fcf0fbc241f1 main.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/main.c b/main.c index bb9a1d6..ca7b625 100644 --- a/main.c +++ b/main.c @@ -513,14 +513,12 @@ static struct batadv_algo_ops *batadv_algo_get(char *name) int batadv_algo_register(struct batadv_algo_ops *bat_algo_ops) { struct batadv_algo_ops *bat_algo_ops_tmp; - int ret; bat_algo_ops_tmp = batadv_algo_get(bat_algo_ops->name); if (bat_algo_ops_tmp) { pr_info("Trying to register already registered routing algorithm: %s\n", bat_algo_ops->name); - ret = -EEXIST; - goto out; + return -EEXIST; } /* all algorithms must implement all ops (for now) */ @@ -534,16 +532,13 @@ int batadv_algo_register(struct batadv_algo_ops *bat_algo_ops) !bat_algo_ops->bat_neigh_is_equiv_or_better) { pr_info("Routing algo '%s' does not implement required ops\n", bat_algo_ops->name); - ret = -EINVAL; - goto out; + return -EINVAL; } INIT_HLIST_NODE(&bat_algo_ops->list); hlist_add_head(&bat_algo_ops->list, &batadv_algo_list); - ret = 0; -out: - return ret; + return 0; } int batadv_algo_select(struct batadv_priv *bat_priv, char *name)

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits March 2015