kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-06-02 03:24:54 +00:00
Code Issues Projects Releases Wiki Activity

ftmod_misdn: Drop custom MIN(),MAX(),CLAMP() macros and use the common ones.

Browse Source 
Signed-off-by: Stefan Knoblich <stkn@openisdn.net>
This commit is contained in:
Stefan Knoblich 2012-07-25 16:08:51 +02:00
parent c3d13d5e00
commit fb57605df7
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libs/freetdm/src/ftmod/ftmod_misdn/ftmod_misdn.c
View File

@ -70,18 +70,6 @@
//#define MISDN_DEBUG_EVENTS //#define MISDN_DEBUG_EVENTS
//#define MISDN_DEBUG_IO //#define MISDN_DEBUG_IO
#ifndef MIN
#define MIN(x,y) (((x) < (y)) ? (x) : (y))
#endif
#ifndef MAX
#define MAX(x,y) (((x) > (y)) ? (x) : (y))
#endif
#ifndef CLAMP
#define CLAMP(val,min,max) (MIN(max,MAX(min,val)))
#endif
typedef enum { typedef enum {
MISDN_CAPS_NONE = 0, MISDN_CAPS_NONE = 0,
@ -1302,7 +1290,7 @@ static FIO_READ_FUNCTION(misdn_read)
} }
if (hh->prim == PH_DATA_IND) { if (hh->prim == PH_DATA_IND) {
*datalen = CLAMP(retval - MISDN_HEADER_LEN, 0, bytes); *datalen = ftdm_clamp(retval - MISDN_HEADER_LEN, 0, bytes);
#ifdef MISDN_DEBUG_IO #ifdef MISDN_DEBUG_IO
ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "misdn_read() received '%s', id: %#x, with %d bytes from channel socket %d [dev.ch: %d.%d]\n", ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "misdn_read() received '%s', id: %#x, with %d bytes from channel socket %d [dev.ch: %d.%d]\n",
misdn_event2str(hh->prim), hh->id, retval - MISDN_HEADER_LEN, ftdmchan->sockfd, addr.dev, addr.channel); misdn_event2str(hh->prim), hh->id, retval - MISDN_HEADER_LEN, ftdmchan->sockfd, addr.dev, addr.channel);
@ -1451,7 +1439,7 @@ static FIO_WRITE_FUNCTION(misdn_write)
hh->id = MISDN_ID_ANY; hh->id = MISDN_ID_ANY;
/* Avoid buffer overflow */ /* Avoid buffer overflow */
size = MIN(size, MAX_DATA_MEM - MISDN_HEADER_LEN); size = ftdm_min(size, MAX_DATA_MEM - MISDN_HEADER_LEN);
memcpy(wbuf + MISDN_HEADER_LEN, data, size); memcpy(wbuf + MISDN_HEADER_LEN, data, size);
size += MISDN_HEADER_LEN; size += MISDN_HEADER_LEN;