From 459df7a7d2ef82c638915f2f662a845b60394397 Mon Sep 17 00:00:00 2001 From: Takashi Kojo Date: Mon, 3 Feb 2014 10:44:21 +0900 Subject: [PATCH] minor fix --- IDE/IAR-EWARM/CyaSSL/HTTPS-NB.c | 12 +++--------- src/io.c | 4 ++-- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/IDE/IAR-EWARM/CyaSSL/HTTPS-NB.c b/IDE/IAR-EWARM/CyaSSL/HTTPS-NB.c index bd0e005a6..df83cf4df 100644 --- a/IDE/IAR-EWARM/CyaSSL/HTTPS-NB.c +++ b/IDE/IAR-EWARM/CyaSSL/HTTPS-NB.c @@ -45,13 +45,13 @@ /*Enable debug*/ #include #define DBG_PRINTF(x, ...) printf("[HTTPSClient : DBG]"x"\r\n", ##__VA_ARGS__); +#define ERR_PRINTF(x, ...) printf("[HTTPSClient:ERROR]"x"\r\n", ##__VA_ARGS__); #else /*Disable debug*/ #define DBG_PRINTF(x, ...) +#define ERR_PRINTF(x, ...) #endif -#define ERR_PRINTF(x, ...) printf("[HTTPSClient:ERROR]"x"\r\n", ##__VA_ARGS__); - static int LwIP_cb_mutex = 0 ; static unsigned long localPort = 0 ; @@ -141,12 +141,6 @@ int CyaSSL_HTTPS_Client_NB(void *nb) switch(https_nb->stat) { case BEGIN: printf("======= LwIP: HTTPS Client Test(%x): %d =========\n", nb, count ++) ; - { - void * p ; - p = (void *)malloc(1) ; - printf("Watermark=%x\n", p) ; - free(p) ; - } /*** Assuming LwIP has been initialized ***/ https_nb->stat = INITIALIZED ; case INITIALIZED: @@ -338,7 +332,7 @@ void *CyaSSL_HTTPS_ClientP_5 = (void *)&CyaSSL_HTTPS_Client_5 ; #define HTTPS_PORT 443 #define IP_ADDR(a,b,c,d) (((a)|((b)<<8)|((c)<<16)|(d)<<24)) -static struct ip_addr server_em = { IP_ADDR(192,168,11,9) } ; +static struct ip_addr server_em = { IP_ADDR(xxx,xxx,xxx,xxx) } ; void HTTPSClient_main_init() { diff --git a/src/io.c b/src/io.c index 02ff56803..e28d0fd39 100644 --- a/src/io.c +++ b/src/io.c @@ -1055,9 +1055,11 @@ void CyaSSL_SetIO_NetX(CYASSL* ssl, NX_TCP_SOCKET* nxSocket, ULONG waitOption) /*Enable debug*/ #include #define DBG_PRINTF(x, ...) printf("[SSLClient : DBG]"x"\r\n", ##__VA_ARGS__); +#define ERR_PRINTF(x, ...) printf("[SSLClient:ERROR]"x"\r\n", ##__VA_ARGS__); #else /*Disable debug*/ #define DBG_PRINTF(x, ...) +#define ERR_PRINTF(x, ...) #endif #if 0 @@ -1068,8 +1070,6 @@ void CyaSSL_SetIO_NetX(CYASSL* ssl, NX_TCP_SOCKET* nxSocket, ULONG waitOption) #define DBG_PRINTF_CB(x, ...) #endif -#define ERR_PRINTF(x, ...) printf("[SSLClient:ERROR]"x"\r\n", ##__VA_ARGS__); - void CyaSSL_PbufFree(void *vp) { struct pbuf *p ;