summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorDavi Arnaut <davi.arnaut@oracle.com>2010-07-23 17:17:55 -0300
committerDavi Arnaut <davi.arnaut@oracle.com>2010-07-23 17:17:55 -0300
commite001970cc7ca527ea7e81647d2fe4b6b5afd4478 (patch)
treeb3bf82e28ac654006ee9f366503dd6a64386db14 /mysys
parent507ca08ff6a731c811a82869f85ba5166e8a9df1 (diff)
downloadmariadb-git-e001970cc7ca527ea7e81647d2fe4b6b5afd4478.tar.gz
WL#5498: Remove dead and unused source code
Remove workarounds for ancient systems. mysys/default.c: Make cast more explicit to ensure a correct offset.
Diffstat (limited to 'mysys')
-rw-r--r--mysys/default.c2
-rw-r--r--mysys/my_pthread.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/mysys/default.c b/mysys/default.c
index 8002a1a0307..0e0883e1fcf 100644
--- a/mysys/default.c
+++ b/mysys/default.c
@@ -575,7 +575,7 @@ int my_load_defaults(const char *conf_file, const char **groups,
void free_defaults(char **argv)
{
MEM_ROOT ptr;
- memcpy_fixed((char*) &ptr,(char *) argv - sizeof(ptr), sizeof(ptr));
+ memcpy(&ptr, ((char *) argv) - sizeof(ptr), sizeof(ptr));
free_root(&ptr,MYF(0));
}
diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c
index 270d13928e3..dee34d10b38 100644
--- a/mysys/my_pthread.c
+++ b/mysys/my_pthread.c
@@ -138,7 +138,7 @@ void sigwait_setup(sigset_t *set)
sact.sa_flags = 0;
sact.sa_handler = px_handle_sig;
- memcpy_fixed(&sact.sa_mask,set,sizeof(*set)); /* handler isn't thread_safe */
+ memcpy(&sact.sa_mask, set, sizeof(*set)); /* handler isn't thread_safe */
sigemptyset(&unblock_mask);
pthread_sigmask(SIG_UNBLOCK,(sigset_t*) 0,&rev_sigwait_set);
@@ -164,7 +164,7 @@ void sigwait_setup(sigset_t *set)
}
}
}
- memcpy_fixed(&sigwait_set,set,sizeof(*set));
+ memcpy(&sigwait_set, set, sizeof(*set));
pthread_sigmask(SIG_BLOCK,(sigset_t*) set,(sigset_t*) 0);
pthread_sigmask(SIG_UNBLOCK,&unblock_mask,(sigset_t*) 0);
}
@@ -252,7 +252,7 @@ void *sigwait_thread(void *set_arg)
struct sigaction sact;
sact.sa_flags = 0;
sact.sa_handler = sigwait_handle_sig;
- memcpy_fixed(&sact.sa_mask,set,sizeof(*set)); /* handler isn't thread_safe */
+ memcpy(&sact.sa_mask, set, sizeof(*set)); /* handler isn't thread_safe */
sigemptyset(&pending_set);
for (i = 1; i <= sizeof(pending_set)*8; i++)