diff options
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/n-dhcp4/src/n-dhcp4-c-probe.c | 2 | ||||
| -rw-r--r-- | shared/nm-utils/nm-test-utils.h | 23 | ||||
| -rw-r--r-- | shared/nm-version-macros.h | 3 | ||||
| -rw-r--r-- | shared/nm-version-macros.h.in | 1 |
4 files changed, 27 insertions, 2 deletions
diff --git a/shared/n-dhcp4/src/n-dhcp4-c-probe.c b/shared/n-dhcp4/src/n-dhcp4-c-probe.c index 308cff83..f1ac3db7 100644 --- a/shared/n-dhcp4/src/n-dhcp4-c-probe.c +++ b/shared/n-dhcp4/src/n-dhcp4-c-probe.c @@ -26,7 +26,7 @@ static int n_dhcp4_client_probe_option_new(NDhcp4ClientProbeOption **optionp, uint8_t n_data) { NDhcp4ClientProbeOption *op; - op = malloc(sizeof(op) + n_data); + op = malloc(sizeof(*op) + n_data); if (!op) return -ENOMEM; diff --git a/shared/nm-utils/nm-test-utils.h b/shared/nm-utils/nm-test-utils.h index b2d103f1..d7a8788d 100644 --- a/shared/nm-utils/nm-test-utils.h +++ b/shared/nm-utils/nm-test-utils.h @@ -2272,6 +2272,29 @@ nmtst_keyfile_assert_data (GKeyFile *kf, const char *data, gssize data_len) g_assert_cmpmem (d2, d2_len, d1, d1_len); } +static inline gssize +nmtst_keyfile_get_num_keys (GKeyFile *keyfile, + const char *group_name) +{ + gs_strfreev char **keys = NULL; + gs_free_error GError *error = NULL; + gsize l; + + g_assert (keyfile); + g_assert (group_name); + + if (!g_key_file_has_group (keyfile, group_name)) + return -1; + + keys = g_key_file_get_keys (keyfile, group_name, &l, &error); + + nmtst_assert_success (keys, error); + + g_assert_cmpint (NM_PTRARRAY_LEN (keys), ==, l); + + return l; +} + /*****************************************************************************/ #endif /* __NM_TEST_UTILS_H__ */ diff --git a/shared/nm-version-macros.h b/shared/nm-version-macros.h index a6779655..92ab28d3 100644 --- a/shared/nm-version-macros.h +++ b/shared/nm-version-macros.h @@ -44,7 +44,7 @@ * Evaluates to the micro version number of NetworkManager which this source * compiled against. */ -#define NM_MICRO_VERSION (0) +#define NM_MICRO_VERSION (2) /** * NM_CHECK_VERSION: @@ -76,6 +76,7 @@ #define NM_VERSION_1_16 (NM_ENCODE_VERSION (1, 16, 0)) #define NM_VERSION_1_18 (NM_ENCODE_VERSION (1, 18, 0)) #define NM_VERSION_1_20 (NM_ENCODE_VERSION (1, 20, 0)) +#define NM_VERSION_1_20_2 (NM_ENCODE_VERSION (1, 20, 2)) /* For releases, NM_API_VERSION is equal to NM_VERSION. * diff --git a/shared/nm-version-macros.h.in b/shared/nm-version-macros.h.in index a546b100..1af3a7b3 100644 --- a/shared/nm-version-macros.h.in +++ b/shared/nm-version-macros.h.in @@ -76,6 +76,7 @@ #define NM_VERSION_1_16 (NM_ENCODE_VERSION (1, 16, 0)) #define NM_VERSION_1_18 (NM_ENCODE_VERSION (1, 18, 0)) #define NM_VERSION_1_20 (NM_ENCODE_VERSION (1, 20, 0)) +#define NM_VERSION_1_20_2 (NM_ENCODE_VERSION (1, 20, 2)) /* For releases, NM_API_VERSION is equal to NM_VERSION. * |