Index: COLINUX_0_5/src/colinux/user/config.h diff -u COLINUX_0_5/src/colinux/user/config.h:1.1.1.2.2.1 COLINUX_0_5/src/colinux/user/config.h:1.1.1.2 --- COLINUX_0_5/src/colinux/user/config.h:1.1.1.2.2.1 Wed Feb 25 08:16:59 2004 +++ COLINUX_0_5/src/colinux/user/config.h Wed Feb 25 03:58:30 2004 @@ -14,8 +14,7 @@ #include #include -#include "macaddress.h" - co_rc_t co_load_config(char *text, co_config_t *out_config); +co_rc_t co_parse_mac_address(const char *text, char *binary); #endif Index: COLINUX_0_5/src/colinux/user/macaddress.c diff -u COLINUX_0_5/src/colinux/user/macaddress.c:1.1.1.1.2.1 COLINUX_0_5/src/colinux/user/macaddress.c:1.1.1.1 --- COLINUX_0_5/src/colinux/user/macaddress.c:1.1.1.1.2.1 Wed Feb 25 08:16:59 2004 +++ COLINUX_0_5/src/colinux/user/macaddress.c Wed Feb 25 03:58:30 2004 @@ -3,10 +3,10 @@ #include "macaddress.h" -co_rc_t co_parse_mac_address(const char *text, unsigned char *binary) +co_rc_t co_parse_mac_address(const char *text, char *binary) { int ret, i; - unsigned mac[6]; + unsigned int mac[6]; if (strlen(text) != 17) { return CO_RC(ERROR); @@ -16,7 +16,7 @@ &mac[0], &mac[1], &mac[2], &mac[3], &mac[4], &mac[5]); for (i=0; i < 6; i++) - binary[i] = (unsigned char)(mac[i] && 0xFF); + binary[i] = (char)mac[i]; if (ret != 6) return CO_RC(ERROR); Index: COLINUX_0_5/src/colinux/user/macaddress.h diff -u COLINUX_0_5/src/colinux/user/macaddress.h:1.1.1.1.2.1 COLINUX_0_5/src/colinux/user/macaddress.h:1.1.1.1 --- COLINUX_0_5/src/colinux/user/macaddress.h:1.1.1.1.2.1 Wed Feb 25 08:16:59 2004 +++ COLINUX_0_5/src/colinux/user/macaddress.h Wed Feb 25 03:58:30 2004 @@ -13,7 +13,7 @@ #include -extern co_rc_t co_parse_mac_address(const char *text, unsigned char *binary); +extern co_rc_t co_parse_mac_address(const char *text, char *binary); extern void co_build_mac_address(char *text, int ntext, const char *mac); #endif