diff options
| author | Tom Gundersen <teg@jklm.no> | 2015-08-27 21:38:36 +0200 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2015-08-27 21:38:36 +0200 |
| commit | 4a316c44aa6222f3abc7ed2d50d00a0817cd4466 (patch) | |
| tree | a66424ffac18c715c70fce1484366cd3c7a9415d /src/libsystemd-network/test-dhcp-option.c | |
| parent | d56cc298808b2dbfa28ae893d6f47f34df3196b1 (diff) | |
| parent | c2c940bda03a07fbacfa3df2590ed865ec3dcc22 (diff) | |
Merge pull request #1055 from poettering/dhcp-updates
Various networkd and dhcp updates
Diffstat (limited to 'src/libsystemd-network/test-dhcp-option.c')
| -rw-r--r-- | src/libsystemd-network/test-dhcp-option.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libsystemd-network/test-dhcp-option.c b/src/libsystemd-network/test-dhcp-option.c index a63a4ea738..b1ef174849 100644 --- a/src/libsystemd-network/test-dhcp-option.c +++ b/src/libsystemd-network/test-dhcp-option.c @@ -145,8 +145,8 @@ static void test_ignore_opts(uint8_t *descoption, int *descpos, int *desclen) { } } -static int test_options_cb(uint8_t code, uint8_t len, const uint8_t *option, void *user_data) { - struct option_desc *desc = user_data; +static int test_options_cb(uint8_t code, uint8_t len, const void *option, void *userdata) { + struct option_desc *desc = userdata; uint8_t *descoption = NULL; int *desclen = NULL, *descpos = NULL; uint8_t optcode = 0; @@ -207,10 +207,10 @@ static int test_options_cb(uint8_t code, uint8_t len, const uint8_t *option, voi for (i = 0; i < len; i++) { if (verbose) - printf("0x%02x(0x%02x) ", option[i], + printf("0x%02x(0x%02x) ", ((uint8_t*) option)[i], descoption[*descpos + 2 + i]); - assert_se(option[i] == descoption[*descpos + 2 + i]); + assert_se(((uint8_t*) option)[i] == descoption[*descpos + 2 + i]); } if (verbose) |