From 6855820e8f13d798f271dc1498cb56ceb48dc521 Mon Sep 17 00:00:00 2001 From: "Vadim B. Mikheev" Date: Mon, 27 Oct 1997 12:07:13 +0000 Subject: [PATCH] c.h: #define StrNCpy(dst,src,len) \ (strncpy((dst),(src),(len)),(len > 0) ? *((dst)+(len)-1)='\0' : \ NULL,(void)(dst)) ^^^^^^ - to avoid "value computed is not used" from gcc in ma-a-any places (should to fix thouse places instead, but ... time) config.h.in: /* * TBL_FREE_CMD_MEMORY: free memory allocated for an user query inside * transaction block after this query is done. */ #define TBL_FREE_CMD_MEMORY - this is default now. --- src/include/c.h | 4 ++-- src/include/config.h.in | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/include/c.h b/src/include/c.h index 2f53a0b09a..5caa424b0a 100644 --- a/src/include/c.h +++ b/src/include/c.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: c.h,v 1.24 1997/10/25 02:14:22 momjian Exp $ + * $Id: c.h,v 1.25 1997/10/27 12:07:10 vadim Exp $ * *------------------------------------------------------------------------- */ @@ -691,7 +691,7 @@ typedef struct Exception */ /* we do this so if the macro is used in an if action, it will work */ #define StrNCpy(dst,src,len) \ - (strncpy((dst),(src),(len)),(len > 0) ? *((dst)+(len)-1)='\0' : NULL,(dst)) + (strncpy((dst),(src),(len)),(len > 0) ? *((dst)+(len)-1)='\0' : NULL,(void)(dst)) /* Get a bit mask of the bits set in non-int32 aligned addresses */ #define INT_ALIGN_MASK (sizeof(int32) - 1) diff --git a/src/include/config.h.in b/src/include/config.h.in index 265927672f..dd57432c87 100644 --- a/src/include/config.h.in +++ b/src/include/config.h.in @@ -315,4 +315,10 @@ */ #define BTREE_VERSION_1 +/* + * TBL_FREE_CMD_MEMORY: free memory allocated for an user query inside + * transaction block after this query is done. + */ +#define TBL_FREE_CMD_MEMORY + #endif /* CONFIG_H */ -- 2.40.0