stv0g/libnl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix build warning after const char ** convert

Browse source 
Commit 25d640da4a caused the following build warning:
../include/netlink/utils.h:47:15: note: expected 'const char **' but argument is of type 'char **'
route/link/inet6.c:300:11: warning: passing argument 2 of 'nl_cancel_down_bytes' from incompatible pointer type [enabled by default]

Revert the const char ** change.

Signed-off-by: Thomas Graf <tgraf@suug.ch>
This commit is contained in:
Thomas Graf 2012-08-29 12:05:51 +02:00
parent 8222519f85
commit 376a0e29c7
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/netlink/utils.h
View file

@ -44,8 +44,8 @@ enum {
};
/* unit pretty-printing */
extern double nl_cancel_down_bytes(unsigned long long, const char **);
extern double nl_cancel_down_bits(unsigned long long, const char **);
extern double nl_cancel_down_bytes(unsigned long long, char **);
extern double nl_cancel_down_bits(unsigned long long, char **);
extern int nl_rate2str(unsigned long long, int, char *, size_t);
extern double nl_cancel_down_us(uint32_t, char **);

4
lib/utils.c
View file

@ -125,7 +125,7 @@ int __nl_read_num_str_file(const char *path, int (*cb)(long, const char *))
*
* @return The cancelled down byte counter in the new unit.
*/
double nl_cancel_down_bytes(unsigned long long l, const char **unit)
double nl_cancel_down_bytes(unsigned long long l, char **unit)
{
if (l >= 1099511627776LL) {
*unit = "TiB";
@ -156,7 +156,7 @@ double nl_cancel_down_bytes(unsigned long long l, const char **unit)
*
* @return The cancelled down bit counter in the new unit.
*/
double nl_cancel_down_bits(unsigned long long l, const char **unit)
double nl_cancel_down_bits(unsigned long long l, char **unit)
{
if (l >= 1000000000000ULL) {
*unit = "Tbit";