From fb57605df7f6ad5238662fe041bab51448c39a0c Mon Sep 17 00:00:00 2001 From: Stefan Knoblich Date: Wed, 25 Jul 2012 16:08:51 +0200 Subject: [PATCH] ftmod_misdn: Drop custom MIN(),MAX(),CLAMP() macros and use the common ones. Signed-off-by: Stefan Knoblich --- libs/freetdm/src/ftmod/ftmod_misdn/ftmod_misdn.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/libs/freetdm/src/ftmod/ftmod_misdn/ftmod_misdn.c b/libs/freetdm/src/ftmod/ftmod_misdn/ftmod_misdn.c index 337bbdf409..2e56c3f39c 100644 --- a/libs/freetdm/src/ftmod/ftmod_misdn/ftmod_misdn.c +++ b/libs/freetdm/src/ftmod/ftmod_misdn/ftmod_misdn.c @@ -70,18 +70,6 @@ //#define MISDN_DEBUG_EVENTS //#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 { MISDN_CAPS_NONE = 0, @@ -1302,7 +1290,7 @@ static FIO_READ_FUNCTION(misdn_read) } 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 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); @@ -1451,7 +1439,7 @@ static FIO_WRITE_FUNCTION(misdn_write) hh->id = MISDN_ID_ANY; /* 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); size += MISDN_HEADER_LEN;