From c96f683b4ba23eda80bbec3660e2489a77751a05 Mon Sep 17 00:00:00 2001
From: meep-eep <meep-eep@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Sun, 26 Nov 2006 03:36:08 +0000
Subject: [PATCH] Consistent naming.

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2547 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/src/sc2code/libs/callback/callback.c       | 2 +-
 sc2/src/sc2code/libs/callback/callback.h       | 2 +-
 sc2/src/sc2code/libs/network/connect/resolve.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sc2/src/sc2code/libs/callback/callback.c b/sc2/src/sc2code/libs/callback/callback.c
index d1a58d185..dfcd5cef0 100644
--- a/sc2/src/sc2code/libs/callback/callback.c
+++ b/sc2/src/sc2code/libs/callback/callback.c
@@ -99,7 +99,7 @@ CallbackLink_find(CallbackLink *link) {
 }
 
 bool
-Callback_removeCallback(CallbackID id) {
+Callback_remove(CallbackID id) {
 	CallbackLink *link = (CallbackLink *) id;
 	CallbackLink **linkPtr;
 
diff --git a/sc2/src/sc2code/libs/callback/callback.h b/sc2/src/sc2code/libs/callback/callback.h
index 0ced485eb..2686cb6ac 100644
--- a/sc2/src/sc2code/libs/callback/callback.h
+++ b/sc2/src/sc2code/libs/callback/callback.h
@@ -34,7 +34,7 @@ typedef void (*CallbackFunction)(CallbackArg arg);
 
 void Callback_init(void);
 CallbackID Callback_add(CallbackFunction callback, CallbackArg arg);
-bool Callback_removeCallback(CallbackID id);
+bool Callback_remove(CallbackID id);
 void Callback_process(void);
 
 #endif  /* _CALLBACK_H */
diff --git a/sc2/src/sc2code/libs/network/connect/resolve.c b/sc2/src/sc2code/libs/network/connect/resolve.c
index c29c8f63f..e1259e709 100644
--- a/sc2/src/sc2code/libs/network/connect/resolve.c
+++ b/sc2/src/sc2code/libs/network/connect/resolve.c
@@ -152,7 +152,7 @@ getaddrinfoAsync(const char *node, const char *service,
 void
 Resolve_close(ResolveState *resolveState) {
 	if (resolveState->callbackID != CallbackID_invalid) {
-		Callback_removeCallback(resolveState->callbackID);
+		Callback_remove(resolveState->callbackID);
 		resolveState->callbackID = CallbackID_invalid;
 	}
 	resolveState->state = Resolve_closed;