From ec63621498e28ea4728d831aca0746f78621f95d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
<grubba@grubba.org>
Date: Sat, 14 Oct 2000 23:07:40 +0200
Subject: [PATCH] Fixed a few warnings.
Rev: src/pike_search.c:1.3
Rev: src/pike_search_engine2.c:1.3
---
src/pike_search.c | 8 ++++----
src/pike_search_engine2.c | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/pike_search.c b/src/pike_search.c
index 5bf909e386..9fa21c1261 100644
--- a/src/pike_search.c
+++ b/src/pike_search.c
@@ -16,7 +16,7 @@
ptrdiff_t pike_search_struct_offset;
#define OB2MSEARCH(O) ((struct pike_mem_searcher *)((O)->storage+pike_search_struct_offset))
-#define THIS ((struct pike_mem_searcher *)(Pike_fp->current_storage))
+#define THIS_MSEARCH ((struct pike_mem_searcher *)(Pike_fp->current_storage))
static struct mapping *memsearch_cache;
struct program *pike_search_program;
@@ -201,9 +201,9 @@ static void f_pike_search(INT32 args)
}
in=MKPCHARP_STR(s);
- ret=THIS->mojt.vtab->funcN(THIS->mojt.data,
- ADD_PCHARP(in,start),
- s->len - start);
+ ret=THIS_MSEARCH->mojt.vtab->funcN(THIS_MSEARCH->mojt.data,
+ ADD_PCHARP(in,start),
+ s->len - start);
pop_n_elems(args);
push_int64( SUBTRACT_PCHARP(in, ret) );
diff --git a/src/pike_search_engine2.c b/src/pike_search_engine2.c
index 88febf6a0d..ce0470c95c 100644
--- a/src/pike_search_engine2.c
+++ b/src/pike_search_engine2.c
@@ -34,7 +34,7 @@ INLINE HCHAR *NameNH(memchr_search)(void *data,
HCHAR *haystack,
ptrdiff_t haystacklen)
{
- return NameNH(MEMCHR)(haystack, (NCHAR)(ptrdiff_t)data, haystacklen);
+ return NameNH(MEMCHR)(haystack, DO_NOT_WARN((NCHAR)(ptrdiff_t)data), haystacklen);
}
--
GitLab