More header work toward draft-ietf-ldapext-ldap-c-api-01.

[openldap] / libraries / liblber / io.c

diff --git a/libraries/liblber/io.c b/libraries/liblber/io.c
index cbf1837a91c3e1c3eeb1fc847c875294a4ed390c..582a883d64a8df8c99a10512145c31199720e404 100644 (file)
--- a/libraries/liblber/io.c
+++ b/libraries/liblber/io.c
@@ -16,19 +16,17 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <ac/ctype.h>
+#include <ac/errno.h>
+#include <ac/socket.h>
 #include <ac/string.h>
-#include <ctype.h>
 #include <ac/unistd.h>
 
-#include <errno.h>
-#include <sys/types.h>
-#include <ac/socket.h>
-
 #ifdef HAVE_IO_H
 #include <io.h>
 #endif
 
-#include "lber.h"
+#include "lber-int.h"
 
 static int ber_realloc LDAP_P(( BerElement *ber, unsigned long len ));
 static int ber_filbuf LDAP_P(( Sockbuf *sb, long len ));
@@ -139,9 +137,8 @@ ber_filbuf( Sockbuf *sb, long len )
 #endif /* LDAP_CONNECTIONLESS */
        } else {
                rc = read( sb->sb_sd, sb->sb_ber.ber_buf,
-                   ((sb->sb_options & LBER_NO_READ_AHEAD) &&
-                   (len < READBUFSIZ)) ?
-                   len : READBUFSIZ );
+                       ((sb->sb_options & LBER_NO_READ_AHEAD) && (len < READBUFSIZ)) ?
+                               len : READBUFSIZ );
        }
 
        if ( rc > 0 ) {
@@ -166,7 +163,7 @@ BerRead( Sockbuf *sb, char *buf, long len )
                                break;
                        return( c );
                }
-               *buf++ = c;
+               *buf++ = (char) c;
                nread++;
                len--;
        }
@@ -307,7 +304,7 @@ ber_flush( Sockbuf *sb, BerElement *ber, int freeit )
 
                        /* fake error if write was not atomic */
                        if (rc < towrite) {
-#if !defined(MACOS) && !defined(DOS)
+#ifdef EMSGSIZE
                            errno = EMSGSIZE;
 #endif
                            return( -1 );
@@ -337,7 +334,7 @@ ber_alloc_t( int options )
        if ( (ber = (BerElement *) calloc( 1, sizeof(BerElement) )) == NULLBER )
                return( NULLBER );
        ber->ber_tag = LBER_DEFAULT;
-       ber->ber_options = options;
+       ber->ber_options = (char) options;
 
        return( ber );
 }
@@ -373,7 +370,7 @@ ber_init( BerElement *ber, int options )
 {
        (void) memset( (char *)ber, '\0', sizeof( BerElement ));
        ber->ber_tag = LBER_DEFAULT;
-       ber->ber_options = options;
+       ber->ber_options = (char) options;
 }