Replace strerror(errno) with %m in format string throughout

[people/ms/libloc.git] / src / test-network.c

diff --git a/src/test-network.c b/src/test-network.c
index 1d4550cc910b46003e960cd17f2ecffeb0f1a6cb..dcb389a6ff3eeb265527221d0b998eadfa7e37e9 100644 (file)
--- a/src/test-network.c
+++ b/src/test-network.c
@@ -23,6 +23,7 @@
 #include <syslog.h>
 
 #include <libloc/libloc.h>
+#include <libloc/address.h>
 #include <libloc/database.h>
 #include <libloc/network.h>
 #include <libloc/private.h>
@@ -79,7 +80,7 @@ int main(int argc, char** argv) {
 #endif
 
        // Check if the first and last addresses are correct
-       char* string = loc_network_format_first_address(network1);
+       const char* string = loc_network_format_first_address(network1);
        if (!string) {
                fprintf(stderr, "Did get NULL instead of a string for the first address\n");
                exit(EXIT_FAILURE);
@@ -175,13 +176,11 @@ int main(int argc, char** argv) {
                exit(EXIT_FAILURE);
        }
 
-       char* s = loc_network_str(subnet1);
+       const char* s = loc_network_str(subnet1);
        printf("Received subnet1 = %s\n", s);
-       free(s);
 
        s = loc_network_str(subnet2);
        printf("Received subnet2 = %s\n", s);
-       free(s);
 
        if (!loc_network_is_subnet(network1, subnet1)) {
                fprintf(stderr, "Subnet1 is not a subnet\n");
@@ -247,7 +246,7 @@ int main(int argc, char** argv) {
        // Try adding an invalid network
        struct loc_network* network;
        err = loc_writer_add_network(writer, &network, "xxxx:xxxx::/32");
-       if (err != -EINVAL) {
+       if (!err) {
                fprintf(stderr, "It was possible to add an invalid network (err = %d)\n", err);
                exit(EXIT_FAILURE);
        }
@@ -261,7 +260,7 @@ int main(int argc, char** argv) {
 
        FILE* f = tmpfile();
        if (!f) {
-               fprintf(stderr, "Could not open file for writing: %s\n", strerror(errno));
+               fprintf(stderr, "Could not open file for writing: %m\n");
                exit(EXIT_FAILURE);
        }
 
@@ -311,6 +310,9 @@ int main(int argc, char** argv) {
        } bit_length_tests[] = {
                { "::/0", 0 },
                { "2001::/128", 126 },
+               { "1.0.0.0/32", 25 },
+               { "0.0.0.1/32", 1 },
+               { "255.255.255.255/32", 32 },
                { NULL, 0, },
        };