changed hstatus_t to herror_t and chagend the API function to return herror_t. Added herror_*() functions and fixed a bug in the socket receive comm.

1 files changed, 11 insertions, 11 deletions

diff --git a/nanohttp/nanohttp-socket.h b/nanohttp/nanohttp-socket.h
index 8deb273..83d8f72 100644
--- a/nanohttp/nanohttp-socket.h
+++ b/nanohttp/nanohttp-socket.h
@@ -1,5 +1,5 @@
 /******************************************************************

- *  $Id: nanohttp-socket.h,v 1.13 2004/10/15 13:29:37 snowdrop Exp $

+ *  $Id: nanohttp-socket.h,v 1.14 2004/10/28 10:30:47 snowdrop Exp $

  *

  * CSOAP Project:  A http client/server library in C

  * Copyright (C) 2003  Ferhat Ayaz

@@ -48,7 +48,7 @@
 

   @returns This function should always return H_OK. 

  */

-hstatus_t hsocket_module_init();

+herror_t hsocket_module_init();

 

 

 /**

@@ -66,7 +66,7 @@ void hsocket_module_destroy();
 

   @returns This function should always return H_OK. 

  */

-hstatus_t hsocket_init(hsocket_t *sock);

+herror_t hsocket_init(hsocket_t *sock);

 

 

 /**

@@ -90,7 +90,7 @@ void hsocket_free(hsocket_t sock);
     <BR>HSOCKET_ERROR_GET_HOSTNAME 

     <BR>HSOCKET_ERROR_CONNECT

  */

-hstatus_t hsocket_open(hsocket_t *sock, const char* host, int port);

+herror_t hsocket_open(hsocket_t *sock, const char* host, int port);

 

 

 /**

@@ -114,7 +114,7 @@ void hsocket_close(hsocket_t sock);
 

   @see hsocket_listen

  */

-hstatus_t hsocket_bind(hsocket_t *sock, int port);

+herror_t hsocket_bind(hsocket_t *sock, int port);

 

 

 /**

@@ -128,7 +128,7 @@ hstatus_t hsocket_bind(hsocket_t *sock, int port);
     <BR>HSOCKET_ERROR_NOT_INITIALIZED

     <BR>HSOCKET_ERROR_LISTEN

 */

-hstatus_t hsocket_listen(hsocket_t sock);

+herror_t hsocket_listen(hsocket_t sock);

 

 

 /**

@@ -142,7 +142,7 @@ hstatus_t hsocket_listen(hsocket_t sock);
     <BR>HSOCKET_ERROR_NOT_INITIALIZED

     <BR>HSOCKET_ERROR_ACCEPT

 */

-hstatus_t hsocket_accept(hsocket_t sock, hsocket_t *dest);

+herror_t hsocket_accept(hsocket_t sock, hsocket_t *dest);

 

 

 /**

@@ -156,7 +156,7 @@ hstatus_t hsocket_accept(hsocket_t sock, hsocket_t *dest);
     <BR>HSOCKET_ERROR_NOT_INITIALIZED

     <BR>HSOCKET_ERROR_SEND

 */

-hstatus_t hsocket_nsend(hsocket_t sock, const byte_t* bytes, int size); 

+herror_t hsocket_nsend(hsocket_t sock, const byte_t* bytes, int size); 

 

 

 /**

@@ -169,7 +169,7 @@ hstatus_t hsocket_nsend(hsocket_t sock, const byte_t* bytes, int size);
     <BR>HSOCKET_ERROR_NOT_INITIALIZED

     <BR>HSOCKET_ERROR_SEND

 */

-hstatus_t hsocket_send(hsocket_t sock, const char* str); 

+herror_t hsocket_send(hsocket_t sock, const char* str); 

 

 

 /**

@@ -188,7 +188,7 @@ hstatus_t hsocket_send(hsocket_t sock, const char* str);
      the socket.

   

 */

-int hsocket_read(hsocket_t sock, byte_t* buffer, int size, int force);

+herror_t hsocket_read(hsocket_t sock, byte_t* buffer, int size, int force, int *readed);

 

 /**

   Sets the goven socket to non-blocking socket mode.

@@ -199,7 +199,7 @@ int hsocket_read(hsocket_t sock, byte_t* buffer, int size, int force);
     <BR>HSOCKET_ERROR_NOT_INITIALIZED

     <BR>HSOCKET_ERROR_IOCTL

 */

-hstatus_t hsocket_block(hsocket_t sock, int block);

+herror_t hsocket_block(hsocket_t sock, int block);

 

 

 #endif