diff --git a/ChangeLog b/ChangeLog index 44a671a..d276390 100755 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ + -- fix compile warnings for gcc4 libpri 1.0.7 -- No Changes libpri 1.0.6 diff --git a/libpri.h b/libpri.h index 0a8087d..0461429 100755 --- a/libpri.h +++ b/libpri.h @@ -364,7 +364,7 @@ pri_event *pri_check_event(struct pri *pri); /* Give a name to a given event ID */ extern char *pri_event2str(int id); -/* Give a name toa node type */ +/* Give a name to a node type */ extern char *pri_node2str(int id); /* Give a name to a switch type */ @@ -373,9 +373,6 @@ extern char *pri_switch2str(int id); /* Print an event */ extern void pri_dump_event(struct pri *pri, pri_event *e); -/* Turn an event ID into a string */ -extern char *pri_event2str(int e); - /* Turn presentation into a string */ extern char *pri_pres2str(int pres); diff --git a/q931.c b/q931.c index 2a5e6d7..7268005 100755 --- a/q931.c +++ b/q931.c @@ -36,7 +36,7 @@ struct msgtype { int msgnum; - unsigned char *name; + char *name; int mandies[MAX_MAND_IES]; }; @@ -775,7 +775,7 @@ static void q931_get_number(unsigned char *num, int maxlen, unsigned char *src, static FUNC_DUMP(dump_called_party_number) { - char cnum[256]; + unsigned char cnum[256]; q931_get_number(cnum, sizeof(cnum), ie->data + 1, len - 3); pri_message("%c Called Number (len=%2d) [ Ext: %d TON: %s (%d) NPI: %s (%d) '%s' ]\n", @@ -784,7 +784,7 @@ static FUNC_DUMP(dump_called_party_number) static FUNC_DUMP(dump_called_party_subaddr) { - char cnum[256]; + unsigned char cnum[256]; q931_get_number(cnum, sizeof(cnum), ie->data + 1, len - 3); pri_message("%c Called Sub-Address (len=%2d) [ Ext: %d Type: %s (%d) O: %d '%s' ]\n", prefix, len, ie->data[0] >> 7, @@ -794,7 +794,7 @@ static FUNC_DUMP(dump_called_party_subaddr) static FUNC_DUMP(dump_calling_party_number) { - char cnum[256]; + unsigned char cnum[256]; if (ie->data[0] & 0x80) q931_get_number(cnum, sizeof(cnum), ie->data + 1, len - 3); else @@ -808,7 +808,7 @@ static FUNC_DUMP(dump_calling_party_number) static FUNC_DUMP(dump_calling_party_subaddr) { - char cnum[256]; + unsigned char cnum[256]; q931_get_number(cnum, sizeof(cnum), ie->data + 2, len - 4); pri_message("%c Calling Sub-Address (len=%2d) [ Ext: %d Type: %s (%d) O: %d '%s' ]\n", prefix, len, ie->data[0] >> 7, @@ -818,7 +818,7 @@ static FUNC_DUMP(dump_calling_party_subaddr) static FUNC_DUMP(dump_redirecting_number) { - char cnum[256]; + unsigned char cnum[256]; int i = 0; /* To follow Q.931 (4.5.1), we must search for start of octet 4 by walking through all bytes until one with ext bit (8) set to 1 */ @@ -845,7 +845,7 @@ static FUNC_DUMP(dump_redirecting_number) static FUNC_DUMP(dump_connected_number) { - char cnum[256]; + unsigned char cnum[256]; int i = 0; /* To follow Q.931 (4.5.1), we must search for start of octet 4 by walking through all bytes until one with ext bit (8) set to 1 */ @@ -887,14 +887,14 @@ static FUNC_RECV(receive_redirecting_number) } } while(!(ie->data[i++] & 0x80)); - q931_get_number(call->redirectingnum, sizeof(call->redirectingnum), ie->data + i, ie->len - i); + q931_get_number((unsigned char *) call->redirectingnum, sizeof(call->redirectingnum), ie->data + i, ie->len - i); return 0; } static FUNC_DUMP(dump_redirecting_subaddr) { - char cnum[256]; + unsigned char cnum[256]; q931_get_number(cnum, sizeof(cnum), ie->data + 2, len - 4); pri_message("%c Redirecting Sub-Address (len=%2d) [ Ext: %d Type: %s (%d) O: %d '%s' ]\n", prefix, len, ie->data[0] >> 7, @@ -905,14 +905,14 @@ static FUNC_DUMP(dump_redirecting_subaddr) static FUNC_RECV(receive_calling_party_subaddr) { /* copy digits to call->callingsubaddr */ - q931_get_number(call->callingsubaddr, sizeof(call->callingsubaddr), ie->data + 2, len - 4); + q931_get_number((unsigned char *) call->callingsubaddr, sizeof(call->callingsubaddr), ie->data + 2, len - 4); return 0; } static FUNC_RECV(receive_called_party_number) { /* copy digits to call->callednum */ - q931_get_number(call->callednum, sizeof(call->callednum), ie->data + 1, len - 3); + q931_get_number((unsigned char *) call->callednum, sizeof(call->callednum), ie->data + 1, len - 3); call->calledplan = ie->data[0] & 0x7f; return 0; } @@ -933,11 +933,11 @@ static FUNC_RECV(receive_calling_party_number) extbit = (ie->data[0] >> 7) & 0x01; if (extbit) { - q931_get_number(call->callernum, sizeof(call->callernum), ie->data + 1, len - 3); + q931_get_number((unsigned char *) call->callernum, sizeof(call->callernum), ie->data + 1, len - 3); call->callerpres = 0; /* PI presentation allowed SI user-provided, not screened */ } else { - q931_get_number(call->callernum, sizeof(call->callernum), ie->data + 2, len - 4); + q931_get_number((unsigned char *) call->callernum, sizeof(call->callernum), ie->data + 2, len - 4); call->callerpres = ie->data[1] & 0x7f; } return 0; @@ -966,7 +966,7 @@ static FUNC_RECV(receive_user_user) { call->useruserprotocoldisc = ie->data[0] & 0xff; if (call->useruserprotocoldisc == 4) /* IA5 */ - q931_get_number(call->useruserinfo, sizeof(call->useruserinfo), ie->data + 1, len - 3); + q931_get_number((unsigned char *) call->useruserinfo, sizeof(call->useruserinfo), ie->data + 1, len - 3); return 0; } @@ -1030,7 +1030,7 @@ static FUNC_RECV(receive_display) data++; len--; } - q931_get_number(call->callername, sizeof(call->callername), data, len - 2); + q931_get_number((unsigned char *) call->callername, sizeof(call->callername), data, len - 2); return 0; } @@ -1064,7 +1064,7 @@ static FUNC_RECV(receive_facility) return 0; } if (ie->data[13] + 14 == ie->len) { - q931_get_number(call->callername, sizeof(call->callername) - 1, ie->data + 14, ie->len - 14); + q931_get_number((unsigned char *) call->callername, sizeof(call->callername) - 1, ie->data + 14, ie->len - 14); } return 0; } @@ -1816,7 +1816,7 @@ static int q931_handle_ie(int codeset, struct pri *pri, q931_call *c, int msg, q return -1; } -static void init_header(struct pri *pri, q931_call *call, char *buf, q931_h **hb, q931_mh **mhb, int *len) +static void init_header(struct pri *pri, q931_call *call, unsigned char *buf, q931_h **hb, q931_mh **mhb, int *len) { /* Returns header and message header and modifies length in place */ q931_h *h = (q931_h *)buf;