浏览代码

corrected function names

Zoadian 11 年之前
父节点
当前提交
c68cafdd73
共有 3 个文件被更改,包括 80 次插入80 次删除
  1. 20 20
      source/derelict/nanomsg/functions.d
  2. 38 38
      source/derelict/nanomsg/nanomsg.d
  3. 22 22
      source/derelict/nanomsg/types.d

+ 20 - 20
source/derelict/nanomsg/functions.d

@@ -91,29 +91,29 @@ extern( C ) @nogc nothrow {
 }
 
 __gshared {
-    da_nanomsg_nn_errno nanomsgErrno;
-    da_nanomsg_nn_strerror nanomsgStrerror;
-    da_nanomsg_nn_symbol nanomsgSymbol;
-    da_nanomsg_nn_symbol_info nanomsgSymbolInfo;
-    da_nanomsg_nn_term nanomsgTerm;
-    da_nanomsg_nn_allocmsg nanomsgAllocmsg;
-    da_nanomsg_nn_freemsg nanomsgFreemsg;
+	da_nanomsg_nn_errno nn_errno;
+	da_nanomsg_nn_strerror nn_strerror;
+	da_nanomsg_nn_symbol nn_symbol;
+	da_nanomsg_nn_symbol_info nn_symbol_info;
+	da_nanomsg_nn_term nn_term;
+	da_nanomsg_nn_allocmsg nn_allocmsg;
+	da_nanomsg_nn_freemsg nn_freemsg;
 	
 	version(none) {
 		//...
 	}
 	
-    da_nanomsg_nn_socket nanomsgSocket;
-    da_nanomsg_nn_close nanomsgClose;
-    da_nanomsg_nn_setsockopt nanomsgSetsockopt;
-    da_nanomsg_nn_getsockopt nanomsgGetsockopt;
-    da_nanomsg_nn_bind nanomsgBind;
-    da_nanomsg_nn_connect nanomsgConnect;
-    da_nanomsg_nn_shutdown nanomsgShutdown;
-    da_nanomsg_nn_send nanomsgSend;
-    da_nanomsg_nn_recv nanomsgRecv;
-    da_nanomsg_nn_sendmsg nanomsgSendmsg;
-    da_nanomsg_nn_recvmsg nanomsgRecvMsg;
-    da_nanomsg_nn_poll nanomsgPoll;
-    da_nanomsg_nn_device nanomsgDevice;
+	da_nanomsg_nn_socket nn_socket;
+	da_nanomsg_nn_close nn_close;
+	da_nanomsg_nn_setsockopt nn_setsockopt;
+	da_nanomsg_nn_getsockopt nn_getsockopt;
+	da_nanomsg_nn_bind nn_bind;
+	da_nanomsg_nn_connect nn_connect;
+	da_nanomsg_nn_shutdown nn_shutdown;
+	da_nanomsg_nn_send nn_send;
+	da_nanomsg_nn_recv nn_recv;
+	da_nanomsg_nn_sendmsg nn_sendmsg;
+	da_nanomsg_nn_recvmsg nn_recvmsg;
+	da_nanomsg_nn_poll nn_poll;
+	da_nanomsg_nn_device nn_device;
 }

+ 38 - 38
source/derelict/nanomsg/nanomsg.d

@@ -33,12 +33,12 @@ public {
 }
 
 private {
-    import derelict.util.loader;
-    import derelict.util.system;
+	import derelict.util.loader;
+	import derelict.util.system;
 
-    static if( Derelict_OS_Windows )
-        enum libNames = "nanomsg.dll";
-    else
+	static if( Derelict_OS_Windows )
+	    enum libNames = "nanomsg.dll";
+	else
         static assert( 0, "Need to implement Nanomsg2 libNames for this operating system." );
 }
 
@@ -50,46 +50,46 @@ load this function and call it before the load method returns. Otherwise, bad th
 private extern( C ) nothrow alias da_Nanomsg_SetMainReady = void function();
 
 class DerelictNanomsgLoader : SharedLibLoader {
-      public this() {
-            super( libNames );
-      }
-
-      protected override void loadSymbols() {
-            bindFunc(cast(void**)&nanomsgErrno, "nn_errno");
-            bindFunc(cast(void**)&nanomsgStrerror, "nn_strerror");
-            bindFunc(cast(void**)&nanomsgSymbol, "nn_symbol");
-            bindFunc(cast(void**)&nanomsgSymbolInfo, "nn_symbol_info");
-            bindFunc(cast(void**)&nanomsgTerm, "nn_term");
-            bindFunc(cast(void**)&nanomsgAllocmsg, "nn_allocmsg");
-            bindFunc(cast(void**)&nanomsgFreemsg, "nn_freemsg");
-
-			version(none) {
-				//...
-			}
-
-            bindFunc(cast(void**)&nanomsgSocket, "nn_socket");
-            bindFunc(cast(void**)&nanomsgClose, "nn_close");
-            bindFunc(cast(void**)&nanomsgSetsockopt, "nn_setsockopt");
-            bindFunc(cast(void**)&nanomsgGetsockopt, "nn_getsockopt");
-            bindFunc(cast(void**)&nanomsgBind, "nn_bind");
-            bindFunc(cast(void**)&nanomsgConnect, "nn_connect");
-            bindFunc(cast(void**)&nanomsgShutdown, "nn_shutown");
-            bindFunc(cast(void**)&nanomsgSend, "nn_send");
-            bindFunc(cast(void**)&nanomsgRecv, "nn_recv");
-            bindFunc(cast(void**)&nanomsgSendmsg, "nn_sendmsg");
-            bindFunc(cast(void**)&nanomsgRecvMsg, "nn_recvmsg");
-            bindFunc(cast(void**)&nanomsgPoll, "nn_poll");
-            bindFunc(cast(void**)&nanomsgDevice, "nn_device");
-      }
+	public this() {
+	    super( libNames );
+	}
+
+	protected override void loadSymbols() {
+		bindFunc(cast(void**)&nn_errno, "nn_errno");
+		bindFunc(cast(void**)&nn_strerror, "nn_strerror");
+		bindFunc(cast(void**)&nn_symbol, "nn_symbol");
+		bindFunc(cast(void**)&nn_symbol_info, "nn_symbol_info");
+		bindFunc(cast(void**)&nn_term, "nn_term");
+		bindFunc(cast(void**)&nn_allocmsg, "nn_allocmsg");
+		bindFunc(cast(void**)&nn_freemsg, "nn_freemsg");
+
+		version(none) {
+			//...
+		}
+
+		bindFunc(cast(void**)&nn_socket, "nn_socket");
+		bindFunc(cast(void**)&nn_close, "nn_close");
+		bindFunc(cast(void**)&nn_setsockopt, "nn_setsockopt");
+		bindFunc(cast(void**)&nn_getsockopt, "nn_getsockopt");
+		bindFunc(cast(void**)&nn_bind, "nn_bind");
+		bindFunc(cast(void**)&nn_connect, "nn_connect");
+		bindFunc(cast(void**)&nn_shutdown, "nn_shutdown");
+		bindFunc(cast(void**)&nn_send, "nn_send");
+		bindFunc(cast(void**)&nn_recv, "nn_recv");
+		bindFunc(cast(void**)&nn_sendmsg, "nn_sendmsg");
+		bindFunc(cast(void**)&nn_recvmsg, "nn_recvmsg");
+		bindFunc(cast(void**)&nn_poll, "nn_poll");
+		bindFunc(cast(void**)&nn_device, "nn_device");
+	}
 }
 
 __gshared DerelictNanomsgLoader DerelictNanomsg;
 
 shared static this() {
-    DerelictNanomsg = new DerelictNanomsgLoader();
+	DerelictNanomsg = new DerelictNanomsgLoader();
 }
 
 shared static ~this()
 {
-    DerelictNanomsg.unload();
+	DerelictNanomsg.unload();
 }

+ 22 - 22
source/derelict/nanomsg/types.d

@@ -123,20 +123,20 @@ enum NN_UNIT_BOOLEAN = 4;
 /*  Structure that is returned from nn_symbol  */
 struct nn_symbol_properties {
 
-    /*  The constant value  */
-    int value;
+	/*  The constant value  */
+	int value;
 
-    /*  The constant name  */
-    const char* name;
+	/*  The constant name  */
+	const char* name;
 
-    /*  The constant namespace, or zero for namespaces themselves */
-    int ns;
+	/*  The constant namespace, or zero for namespaces themselves */
+	int ns;
 
-    /*  The option type for socket option constants  */
-    int type;
+	/*  The option type for socket option constants  */
+	int type;
 
-    /*  The unit for the option value for socket option constants  */
-    int unit;
+	/*  The unit for the option value for socket option constants  */
+	int unit;
 };
 
 /******************************************************************************/
@@ -151,21 +151,21 @@ enum NN_MSG = cast(size_t)(-1);
 /******************************************************************************/
 
 struct nn_iovec {
-    void* iov_base;
-    size_t iov_len;
+	void* iov_base;
+	size_t iov_len;
 };
 
 struct nn_msghdr {
-    nn_iovec* msg_iov;
-    int msg_iovlen;
-    void* msg_control;
-    size_t msg_controllen;
+	nn_iovec* msg_iov;
+	int msg_iovlen;
+	void* msg_control;
+	size_t msg_controllen;
 };
 
 struct nn_cmsghdr {
-    size_t cmsg_len;
-    int cmsg_level;
-    int cmsg_type;
+	size_t cmsg_len;
+	int cmsg_level;
+	int cmsg_type;
 };
 
 /*  SP address families.                                                      */
@@ -211,9 +211,9 @@ enum NN_POLLIN = 1;
 enum NN_POLLOUT = 2;
 
 struct nn_pollfd {
-    int fd;
-    short events;
-    short revents;
+	int fd;
+	short events;
+	short revents;
 };