chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use space after a silencing (void)
[elogind.git]
/
src
/
libsystemd-network
/
lldp-internal.c
diff --git
a/src/libsystemd-network/lldp-internal.c
b/src/libsystemd-network/lldp-internal.c
index d03445b1e2aac3d64fc358553b4270ee9ee18167..0f354461f7ec16ac6795603a35fcf2bba3da798a 100644
(file)
--- a/
src/libsystemd-network/lldp-internal.c
+++ b/
src/libsystemd-network/lldp-internal.c
@@
-54,14
+54,14
@@
int lldp_read_chassis_id(tlv_packet *tlv,
break;
default:
break;
default:
- r = -E
NOTSU
P;
+ r = -E
OPNOTSUP
P;
break;
}
*type = subtype;
out1:
break;
}
*type = subtype;
out1:
- (void)lldp_tlv_packet_exit_container(tlv);
+ (void)
lldp_tlv_packet_exit_container(tlv);
out2:
return r;
out2:
return r;
@@
-89,6
+89,7
@@
int lldp_read_port_id(tlv_packet *tlv,
case LLDP_PORT_SUBTYPE_PORT_COMPONENT:
case LLDP_PORT_SUBTYPE_INTERFACE_ALIAS:
case LLDP_PORT_SUBTYPE_INTERFACE_NAME:
case LLDP_PORT_SUBTYPE_PORT_COMPONENT:
case LLDP_PORT_SUBTYPE_INTERFACE_ALIAS:
case LLDP_PORT_SUBTYPE_INTERFACE_NAME:
+ case LLDP_PORT_SUBTYPE_LOCALLY_ASSIGNED:
r = tlv_packet_read_string(tlv, &s, length);
if (r < 0)
r = tlv_packet_read_string(tlv, &s, length);
if (r < 0)
@@
-105,14
+106,14
@@
int lldp_read_port_id(tlv_packet *tlv,
break;
default:
break;
default:
- r = -E
NOTSU
P;
+ r = -E
OPNOTSUP
P;
break;
}
*type = subtype;
out1:
break;
}
*type = subtype;
out1:
- (void)lldp_tlv_packet_exit_container(tlv);
+ (void)
lldp_tlv_packet_exit_container(tlv);
out2:
return r;
out2:
return r;
@@
-129,7
+130,7
@@
int lldp_read_ttl(tlv_packet *tlv, uint16_t *ttl) {
r = tlv_packet_read_u16(tlv, ttl);
r = tlv_packet_read_u16(tlv, ttl);
- (void)lldp_tlv_packet_exit_container(tlv);
+ (void)
lldp_tlv_packet_exit_container(tlv);
out:
return r;
out:
return r;
@@
-154,7
+155,7
@@
int lldp_read_system_name(tlv_packet *tlv,
*data = (char *) s;
out:
*data = (char *) s;
out:
- (void)lldp_tlv_packet_exit_container(tlv);
+ (void)
lldp_tlv_packet_exit_container(tlv);
return r;
}
return r;
}
@@
-178,7
+179,7
@@
int lldp_read_system_description(tlv_packet *tlv,
*data = (char *) s;
out:
*data = (char *) s;
out:
- (void)lldp_tlv_packet_exit_container(tlv);
+ (void)
lldp_tlv_packet_exit_container(tlv);
return r;
}
return r;
}
@@
-202,7
+203,7
@@
int lldp_read_port_description(tlv_packet *tlv,
*data = (char *) s;
out:
*data = (char *) s;
out:
- (void)lldp_tlv_packet_exit_container(tlv);
+ (void)
lldp_tlv_packet_exit_container(tlv);
return r;
}
return r;
}
@@
-223,7
+224,7
@@
int lldp_read_system_capability(tlv_packet *tlv, uint16_t *data) {
return 0;
out:
return 0;
out:
- (void)lldp_tlv_packet_exit_container(tlv);
+ (void)
lldp_tlv_packet_exit_container(tlv);
return r;
}
return r;
}
@@
-496,7
+497,7
@@
int lldp_chassis_new(tlv_packet *tlv,
Prioq *by_expiry,
Hashmap *neighbour_mib,
lldp_chassis **ret) {
Prioq *by_expiry,
Hashmap *neighbour_mib,
lldp_chassis **ret) {
- _cleanup_lldp_chassis_free_ lldp_chassis *c;
+ _cleanup_lldp_chassis_free_ lldp_chassis *c
= NULL
;
uint16_t length;
uint8_t *data;
uint8_t type;
uint16_t length;
uint8_t *data;
uint8_t type;