diff options
| author | Patrick McHardy <kaber@trash.net> | 2013-04-01 11:44:59 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2013-04-01 11:44:59 +0200 |
| commit | d2b5cbd88ad9af1fc749b22f19dad9c15d6cbb85 (patch) | |
| tree | 8edc879632989f8a5ea1664f03e83f999c8e0efa /src/nl-list-sockets.c | |
| parent | 94cd080452720149008a9c25a9364c5a4d3ccae7 (diff) | |
| parent | 6c9be5a31681ddf9a669ecf643092928ab0f2138 (diff) | |
Merge git://git.infradead.org/users/tgr/libnl
Signed-off-by: Patrick McHardy <kaber@trash.net>
Conflicts:
include/linux/netlink.h
lib/Makefile.am
lib/error.c
libnl-3.0.pc.in
src/Makefile.am
Diffstat (limited to 'src/nl-list-sockets.c')
| -rw-r--r-- | src/nl-list-sockets.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nl-list-sockets.c b/src/nl-list-sockets.c index 868006e..c2fa1cd 100644 --- a/src/nl-list-sockets.c +++ b/src/nl-list-sockets.c @@ -30,7 +30,7 @@ int main(int argc, char *argv[]) while (fgets(buf, sizeof(buf), fd)) { unsigned long sk, cb; int ret, proto, pid, rmem, wmem, refcnt; - uint32_t groups; + unsigned int groups; ret = sscanf(buf, "%lx %d %d %08x %d %d %lx %d\n", &sk, &proto, &pid, &groups, &rmem, &wmem, |