diff options
-rw-r--r-- | COPYING | 2 | ||||
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | ax25io.c | 2 | ||||
-rw-r--r-- | axconfig.c | 28 | ||||
-rw-r--r-- | axutils.c | 6 | ||||
-rw-r--r-- | netax25/ax25io.h | 2 | ||||
-rw-r--r-- | nrconfig.c | 62 | ||||
-rw-r--r-- | procutils.c | 2 | ||||
-rw-r--r-- | rsconfig.c | 32 |
9 files changed, 72 insertions, 72 deletions
@@ -457,7 +457,7 @@ DAMAGES. END OF TERMS AND CONDITIONS - How to Apply These Terms to Your New Libraries + How to Apply These Terms to Your New Libraries If you develop a new library, and you want it to be of the greatest possible use to the public, we recommend making it free software that @@ -1,6 +1,6 @@ * Interfaces with a callsign without SSID were not been found anymore after the last patch below. See cvs comment for detail. - Affected files: axconfig.c, nrconfig.c and procutils.c. + Affected files: axconfig.c, nrconfig.c and procutils.c. -- Thomas Osterried DL9SAU <ax25@x-berg.in-berlin.de> Wed, 01 Feb 2012 00:10:45 +0100 @@ -27,9 +27,9 @@ libax25 0.0.11 libax25 0.0.10 - * Fixed byte counting in flush_obuf() (PE1RXQ) - * Fixed buffer overflow in flush_obuf() (PE1RXQ) - * axio_flush() actually flushes the buffer (PE1RXQ) + * Fixed byte counting in flush_obuf() (PE1RXQ) + * Fixed buffer overflow in flush_obuf() (PE1RXQ) + * axio_flush() actually flushes the buffer (PE1RXQ) -- Craig Small <csmall@small.dropbear.id.au> Fri, 29 Mar 2002 08:54:20 +1100 @@ -592,7 +592,7 @@ char *axio_getline(ax25io *p) int ret; ret = axio_gets((char *) p->gbuf + p->gbuf_usage, - AXBUFLEN - p->gbuf_usage, p); + AXBUFLEN - p->gbuf_usage, p); if (ret > 0 || (ret == 0 && errno == 0)) { p->gbuf_usage = 0; return (char *) p->gbuf; @@ -239,7 +239,7 @@ static int ax25_config_init_port(int fd, int lineno, char *line, const char **if if ((cp = strstr(call, "-0")) != NULL) *cp = '\0'; for (;ifcalls && *ifcalls; ++ifcalls, ++ifdevs) { - if (strcmp(call, *ifcalls) == 0) { + if (strcmp(call, *ifcalls) == 0) { found = 1; dev = *ifdevs; break; @@ -313,7 +313,7 @@ int ax25_config_load_ports(void) memset(&ifr, 0, sizeof(ifr)); strncpy(ifr.ifr_name, s, IFNAMSIZ-1); - ifr.ifr_name[IFNAMSIZ-1] = 0; + ifr.ifr_name[IFNAMSIZ-1] = 0; if (ioctl(fd, SIOCGIFHWADDR, &ifr) < 0) { fprintf(stderr, "axconfig: SIOCGIFHWADDR: %s\n", strerror(errno)); @@ -335,22 +335,22 @@ int ax25_config_load_ports(void) if (!(ifr.ifr_flags & IFF_UP)) continue; - if ((pp = realloc(calllist, sizeof(char *) * (callcount+2))) == 0) - break; + if ((pp = realloc(calllist, sizeof(char *) * (callcount+2))) == 0) + break; calllist = pp; if ((pp = realloc(devlist, sizeof(char *) * (callcount+2))) == 0) - break; + break; devlist = pp; if ((calllist[callcount] = strdup(s)) != NULL) { - if ((devlist[callcount] = strdup(ifr.ifr_name)) != NULL) { - ++callcount; - calllist[callcount] = NULL; - devlist [callcount] = NULL; - } else { - free((void*)calllist[callcount]); - calllist[callcount] = NULL; - } - } + if ((devlist[callcount] = strdup(ifr.ifr_name)) != NULL) { + ++callcount; + calllist[callcount] = NULL; + devlist [callcount] = NULL; + } else { + free((void*)calllist[callcount]); + calllist[callcount] = NULL; + } + } } fclose(fp); fp = NULL; @@ -254,10 +254,10 @@ int ax25_cmp(const ax25_address *a, const ax25_address *b) if ((a->ax25_call[5] & 0xFE) != (b->ax25_call[5] & 0xFE)) return 1; - if ((a->ax25_call[6] & 0x1E) != (b->ax25_call[6] & 0x1E)) /* SSID without control bit */ - return 2; + if ((a->ax25_call[6] & 0x1E) != (b->ax25_call[6] & 0x1E)) /* SSID without control bit */ + return 2; - return 0; + return 0; } /* diff --git a/netax25/ax25io.h b/netax25/ax25io.h index 5d143b1..48db214 100644 --- a/netax25/ax25io.h +++ b/netax25/ax25io.h @@ -39,7 +39,7 @@ typedef struct ax25io_s { int optr; /* output pointer */ void *zptr; /* pointer to the compression struct */ - struct ax25io_s *next; /* linked list pointer */ + struct ax25io_s *next; /* linked list pointer */ } ax25io; #define EOLMODE_TEXT 0 @@ -34,21 +34,21 @@ static NR_Port *nr_port_tail; static int is_same_call(char *call1, char *call2) { - if (!call1 || !call2) - return 0; - for (; *call1 && *call2; call1++, call2++) { - if (*call1 == '-' || *call2 == '-') - break; - if (tolower(*call1 & 0xff) != tolower(*call2 & 0xff)) - return 0; - } - if (!*call1 && !*call2) - return 1; - if (!*call1 && !strcmp(call2, "-0")) - return 1; - if (!*call2 && !strcmp(call1, "-0")) - return 1; - return (!strcmp(call1, call2) ? 1 : 0); + if (!call1 || !call2) + return 0; + for (; *call1 && *call2; call1++, call2++) { + if (*call1 == '-' || *call2 == '-') + break; + if (tolower(*call1 & 0xff) != tolower(*call2 & 0xff)) + return 0; + } + if (!*call1 && !*call2) + return 1; + if (!*call1 && !strcmp(call2, "-0")) + return 1; + if (!*call2 && !strcmp(call1, "-0")) + return 1; + return (!strcmp(call1, call2) ? 1 : 0); } static NR_Port *nr_port_ptr(char *name) @@ -315,23 +315,23 @@ int nr_config_load_ports(void) continue; - if ((pp = realloc(calllist, sizeof(char *) * (callcount+2))) == 0) - break; - calllist = pp; - if ((pp = realloc(devlist, sizeof(char *) * (callcount+2))) == 0) - break; - devlist = pp; - if ((calllist[callcount] = strdup(s)) != NULL) { - if ((devlist[callcount] = strdup(ifr.ifr_name)) != NULL) { - ++callcount; - calllist[callcount] = NULL; - devlist [callcount] = NULL; - } else { - free((void*)calllist[callcount]); - calllist[callcount] = NULL; + if ((pp = realloc(calllist, sizeof(char *) * (callcount+2))) == 0) + break; + calllist = pp; + if ((pp = realloc(devlist, sizeof(char *) * (callcount+2))) == 0) + break; + devlist = pp; + if ((calllist[callcount] = strdup(s)) != NULL) { + if ((devlist[callcount] = strdup(ifr.ifr_name)) != NULL) { + ++callcount; + calllist[callcount] = NULL; + devlist [callcount] = NULL; + } else { + free((void*)calllist[callcount]); + calllist[callcount] = NULL; devlist[callcount] = NULL; - } - } + } + } } fclose(fp); fp = NULL; diff --git a/procutils.c b/procutils.c index dc396e5..b0467a8 100644 --- a/procutils.c +++ b/procutils.c @@ -669,5 +669,5 @@ struct proc_nr_nodes *find_node(char *addr, struct proc_nr_nodes *nodes) } if (!nodes) free_proc_nr_nodes(list); - return p; + return p; } @@ -261,21 +261,21 @@ int rs_config_load_ports(void) continue; - if ((pp = realloc(calllist, sizeof(char *) * (callcount+2))) == 0) - break; - calllist = pp; - if ((pp = realloc(devlist, sizeof(char *) * (callcount+2))) == 0) - break; - devlist = pp; - if ((calllist[callcount] = strdup(s)) != NULL) { - if ((devlist[callcount] = strdup(ifr.ifr_name)) != NULL) { - ++callcount; - calllist[callcount] = NULL; - devlist [callcount] = NULL; - } else { - free((void*)calllist[callcount]); - } - } + if ((pp = realloc(calllist, sizeof(char *) * (callcount+2))) == 0) + break; + calllist = pp; + if ((pp = realloc(devlist, sizeof(char *) * (callcount+2))) == 0) + break; + devlist = pp; + if ((calllist[callcount] = strdup(s)) != NULL) { + if ((devlist[callcount] = strdup(ifr.ifr_name)) != NULL) { + ++callcount; + calllist[callcount] = NULL; + devlist [callcount] = NULL; + } else { + free((void*)calllist[callcount]); + } + } } fclose(fp); fp = NULL; @@ -305,7 +305,7 @@ int rs_config_load_ports(void) for(i = 0; calllist && calllist[i]; ++i) { free((void*)calllist[i]); if (devlist[i] != NULL) - free((void*)devlist[i]); + free((void*)devlist[i]); } if (calllist) free(calllist); if (devlist) free(devlist); |