aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZeex <zeex@rocketmail.com>2013-01-15 04:02:06 +0700
committerZeex <zeex@rocketmail.com>2013-01-15 04:02:06 +0700
commitfed3d67e29a3e134e5da6309783c4db0160a131c (patch)
tree6d4bfd6d1aed3e71dd9ce51d9138590574e32b60
parentb4a5493e5b4afe613b340dbfe79e358b6ece5c62 (diff)
downloadsubhook-fed3d67e29a3e134e5da6309783c4db0160a131c.zip
subhook-fed3d67e29a3e134e5da6309783c4db0160a131c.tar.gz
subhook-fed3d67e29a3e134e5da6309783c4db0160a131c.tar.bz2
Rename some functions
-rw-r--r--README.md4
-rw-r--r--subhook.c8
-rw-r--r--subhook.h28
-rw-r--r--subhook_x86.c8
4 files changed, 24 insertions, 24 deletions
diff --git a/README.md b/README.md
index c1fb07e..3658c4a 100644
--- a/README.md
+++ b/README.md
@@ -28,11 +28,11 @@ int main() {
foo_hook = subhook_new();
/* 'source' is the function that we want to hook. */
- subhook_set_source((void*)foo);
+ subhook_set_src((void*)foo);
/* 'destination' is the function that will be called in place
* of the original function */
- subhook_set_destination((void*)my_foo);
+ subhook_set_dst((void*)my_foo);
/* Install our newly created hook so from now on any call to foo()
* will be redirected to my_foo(). */
diff --git a/subhook.c b/subhook.c
index 9a96ea5..f4b3c5d 100644
--- a/subhook.c
+++ b/subhook.c
@@ -47,19 +47,19 @@ SUBHOOK_EXPORT void SUBHOOK_API subhook_free(struct subhook *hook) {
free(hook);
}
-SUBHOOK_EXPORT void *SUBHOOK_API subhook_get_source(struct subhook *hook) {
+SUBHOOK_EXPORT void *SUBHOOK_API subhook_get_src(struct subhook *hook) {
return hook->src;
}
-SUBHOOK_EXPORT void *SUBHOOK_API subhook_get_destination(struct subhook *hook) {
+SUBHOOK_EXPORT void *SUBHOOK_API subhook_get_dst(struct subhook *hook) {
return hook->dst;
}
-SUBHOOK_EXPORT void SUBHOOK_API subhook_set_source(struct subhook *hook, void *src) {
+SUBHOOK_EXPORT void SUBHOOK_API subhook_set_src(struct subhook *hook, void *src) {
hook->src = src;
}
-SUBHOOK_EXPORT void SUBHOOK_API subhook_set_destination(struct subhook *hook, void *dst) {
+SUBHOOK_EXPORT void SUBHOOK_API subhook_set_dst(struct subhook *hook, void *dst) {
hook->dst = dst;
}
diff --git a/subhook.h b/subhook.h
index 16d3d4c..0777930 100644
--- a/subhook.h
+++ b/subhook.h
@@ -84,11 +84,11 @@
SUBHOOK_EXPORT struct subhook *SUBHOOK_API subhook_new();
SUBHOOK_EXPORT void SUBHOOK_API subhook_free(struct subhook *hook);
-SUBHOOK_EXPORT void SUBHOOK_API subhook_set_source(struct subhook *hook, void *src);
-SUBHOOK_EXPORT void *SUBHOOK_API subhook_get_source(struct subhook *hook);
+SUBHOOK_EXPORT void SUBHOOK_API subhook_set_src(struct subhook *hook, void *src);
+SUBHOOK_EXPORT void *SUBHOOK_API subhook_get_src(struct subhook *hook);
-SUBHOOK_EXPORT void SUBHOOK_API subhook_set_destination(struct subhook *hook, void *dst);
-SUBHOOK_EXPORT void *SUBHOOK_API subhook_get_destination(struct subhook *hook);
+SUBHOOK_EXPORT void SUBHOOK_API subhook_set_dst(struct subhook *hook, void *dst);
+SUBHOOK_EXPORT void *SUBHOOK_API subhook_get_dst(struct subhook *hook);
/* These return 0 on failure and 1 on success. */
SUBHOOK_EXPORT int SUBHOOK_API subhook_install(struct subhook *hook);
@@ -109,12 +109,12 @@ static int subhook_is_installed(struct subhook *hook) {
* This is useful when you don't know the address or want to check
* whether src has been hooked with subhook.
*/
-SUBHOOK_EXPORT void *SUBHOOK_API subhook_read_destination(void *src);
+SUBHOOK_EXPORT void *SUBHOOK_API subhook_read_dst(void *src);
-#define SUBHOOK_INSTALL_HOOK(hook, src, dest) \
+#define SUBHOOK_INSTALL_HOOK(hook, src, dst) \
do {\
- subhook_set_source(hook, src);\
- subhook_set_destination(hook, dest);\
+ subhook_set_src(hook, src);\
+ subhook_set_dst(hook, dst);\
subhook_install(hook);\
} while (0);
@@ -124,14 +124,14 @@ class SubHook {
public:
SubHook() {
hook_ = subhook_new();
- subhook_set_source(hook_, 0);
- subhook_set_destination(hook_, 0);
+ subhook_set_src(hook_, 0);
+ subhook_set_dst(hook_, 0);
}
SubHook(void *src, void *dst) {
hook_ = subhook_new();
- subhook_set_source(hook_, src);
- subhook_set_destination(hook_, dst);
+ subhook_set_src(hook_, src);
+ subhook_set_dst(hook_, dst);
}
~SubHook() {
@@ -152,8 +152,8 @@ public:
bool Install(void *src, void *dst) {
if (!installed_) {
- subhook_set_source(hook_, src);
- subhook_set_destination(hook_, dst);
+ subhook_set_src(hook_, src);
+ subhook_set_dst(hook_, dst);
subhook_install(hook_);
installed_ = true;
return true;
diff --git a/subhook_x86.c b/subhook_x86.c
index a838ed8..4be36ff 100644
--- a/subhook_x86.c
+++ b/subhook_x86.c
@@ -57,8 +57,8 @@ SUBHOOK_EXPORT int SUBHOOK_API subhook_install(struct subhook *hook) {
if (subhook_is_installed(hook))
return -EINVAL;
- src = subhook_get_source(hook);
- dst = subhook_get_destination(hook);
+ src = subhook_get_src(hook);
+ dst = subhook_get_dst(hook);
subhook_unprotect(src, SUBHOOK_JUMP_SIZE);
memcpy(((struct subhook_x86 *)hook->arch)->code, src, SUBHOOK_JUMP_SIZE);
@@ -79,13 +79,13 @@ SUBHOOK_EXPORT int SUBHOOK_API subhook_remove(struct subhook *hook) {
if (!subhook_is_installed(hook))
return -EINVAL;
- memcpy(subhook_get_source(hook), ((struct subhook_x86 *)hook->arch)->code, SUBHOOK_JUMP_SIZE);
+ memcpy(subhook_get_src(hook), ((struct subhook_x86 *)hook->arch)->code, SUBHOOK_JUMP_SIZE);
subhook_set_flags(hook, subhook_get_flags(hook) & ~(SUBHOOK_FLAG_INSTALLED));
return 0;
}
-SUBHOOK_EXPORT void *SUBHOOK_API subhook_read_destination(void *src) {
+SUBHOOK_EXPORT void *SUBHOOK_API subhook_read_dst(void *src) {
if (*(unsigned char*)src == 0xE9)
return (void *)(*(int *)((int)src + 1) + (int)src + SUBHOOK_JUMP_SIZE);