Conflict resolution.

2023-09-21 20:44:44 +02:00
parent 6a97893cc8 491cdda458
commit 1fa5f7c406
406 changed files with 8810 additions and 5865 deletions
--- a/src/network/network.c
+++ b/src/network/network.c
@@ -722,7 +722,7 @@ network_card_has_config(int card)
 }

 /* UI */
-char *
+const char *
 network_card_get_internal_name(int card)
 {
    return device_get_internal_name(net_cards[card]);
@@ -735,7 +735,7 @@ network_card_get_from_internal_name(char *s)
    int c = 0;

    while (net_cards[c] != NULL) {
-        if (!strcmp((char *) net_cards[c]->internal_name, s))
+        if (!strcmp(net_cards[c]->internal_name, s))
            return c;
        c++;
    }