mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-02-17 14:00:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove unsigned long: Change to ber_len_t or ber_tag_t.

Browse Source 
Remove sizeof(long).
Change ber_getnint to return ber_len_t instead of ber_tag_t.
This commit is contained in:
Hallvard Furuseth 1999-08-02 01:50:08 +00:00
parent 6ae8c7e5cf
commit 2d4f915de9
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libraries/liblber/decode.c
View File

@ -30,7 +30,7 @@
#include "lber-int.h"
static ber_tag_t ber_getnint LDAP_P((
static ber_len_t ber_getnint LDAP_P((
BerElement *ber,
ber_int_t *num,
ber_len_t len ));
@ -107,7 +107,7 @@ ber_skip_tag( BerElement *ber, ber_len_t *len )
* Next, read the length. The first byte contains the length of
* the length. If bit 8 is set, the length is the long form,
* otherwise it's the short form. We don't allow a length that's
* greater than what we can hold in an unsigned long.
* greater than what we can hold in a ber_len_t.
*/
*len = netlen = 0;
@ -154,7 +154,7 @@ ber_peek_tag(
return( tag );
}
static ber_tag_t
static ber_len_t
ber_getnint(
BerElement *ber,
ber_int_t *num,
@ -215,7 +215,7 @@ ber_get_int(
if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT )
return( LBER_DEFAULT );
if ( (unsigned long) ber_getnint( ber, num, len ) != len )
if ( ber_getnint( ber, num, len ) != len )
return( LBER_DEFAULT );
else
return( tag );
@ -242,7 +242,7 @@ ber_get_stringb(
if ( datalen > (*len - 1) )
return( LBER_DEFAULT );
if ( (unsigned long) ber_read( ber, buf, datalen ) != datalen )
if ( (ber_len_t) ber_read( ber, buf, datalen ) != datalen )
return( LBER_DEFAULT );
buf[datalen] = '\0';
@ -289,7 +289,7 @@ ber_get_stringa( BerElement *ber, char **buf )
if ( (*buf = (char *) LBER_MALLOC( datalen + 1 )) == NULL )
return( LBER_DEFAULT );
if ( (unsigned long) ber_read( ber, *buf, datalen ) != datalen ) {
if ( (ber_len_t) ber_read( ber, *buf, datalen ) != datalen ) {
LBER_FREE( *buf );
*buf = NULL;
return( LBER_DEFAULT );
@ -393,7 +393,7 @@ ber_get_bitstringa(
return( LBER_DEFAULT );
}
if ( (unsigned long) ber_read( ber, *buf, datalen ) != datalen ) {
if ( (ber_len_t) ber_read( ber, *buf, datalen ) != datalen ) {
LBER_FREE( buf );
*buf = NULL;
return( LBER_DEFAULT );

5
libraries/liblber/dtest.c
View File

@ -41,7 +41,8 @@ main( int argc, char **argv )
char *s;
int rc;
unsigned long tag, len;
ber_tag_t tag;
ber_len_t len;
BerElement *ber;
Sockbuf *sb;
@ -73,7 +74,7 @@ main( int argc, char **argv )
}
printf("decode: message tag 0x%lx and length %ld\n",
tag, len );
(unsigned long) tag, (long) len );
for( s = argv[1]; *s; s++ ) {
char buf[128];

9
libraries/liblber/encode.c
View File

@ -131,9 +131,8 @@ ber_put_len( BerElement *ber, ber_len_t len, int nosos )
*/
if ( len <= 127 ) {
netlen = LBER_LEN_HTON( len );
return( ber_write( ber, (char *) &netlen + sizeof(long) - 1,
1, nosos ) );
char length_byte = (char) len;
return( ber_write( ber, &length_byte, 1, nosos ) );
}
/*
@ -293,7 +292,7 @@ ber_put_ostring(
#endif /* STR_TRANSLATION */
if ( (lenlen = ber_put_len( ber, len, 0 )) == -1 ||
(unsigned long) ber_write( ber, str, len, 0 ) != len ) {
(ber_len_t) ber_write( ber, str, len, 0 ) != len ) {
rc = -1;
} else {
/* return length of tag + length + contents */
@ -539,7 +538,7 @@ ber_put_seqorset( BerElement *ber )
return( -1 );
/* the length itself */
if ( ber_write( ber, (char *) &netlen + sizeof(long)
if ( ber_write( ber, (char *) (&netlen + 1)
- (FOUR_BYTE_LEN - 1), FOUR_BYTE_LEN - 1, 1 )
!= FOUR_BYTE_LEN - 1 )
return( -1 );