mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix struct initialization in ber_scanf() for ANSI C conformance

Browse Source
This commit is contained in:
Howard Chu 2002-01-12 02:23:04 +00:00
parent 7e9c78fbc6
commit 0ecc0414a5
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libraries/liblber/decode.c
View File

@ -299,8 +299,8 @@ enum bgbvc { ChArray, BvArray, BvVec, BvOff };
* stack use to the absolute minimum. * stack use to the absolute minimum.
*/ */
typedef struct bgbvr { typedef struct bgbvr {
BerElement *ber;
enum bgbvc choice; enum bgbvc choice;
BerElement *ber;
ber_tag_t tag; ber_tag_t tag;
ber_len_t len; ber_len_t len;
char *last; char *last;
@ -729,7 +729,8 @@ ber_scanf ( BerElement *ber,
case 'v': /* sequence of strings */ case 'v': /* sequence of strings */
{ {
bgbvr cookie = { ber, ChArray }; bgbvr cookie = { ChArray };
cookie.ber = ber;
cookie.res.c = va_arg( ap, char *** ); cookie.res.c = va_arg( ap, char *** );
cookie.alloc = 1; cookie.alloc = 1;
rc = ber_get_stringbvr( &cookie, 0 ); rc = ber_get_stringbvr( &cookie, 0 );
@ -738,7 +739,8 @@ ber_scanf ( BerElement *ber,
case 'V': /* sequence of strings + lengths */ case 'V': /* sequence of strings + lengths */
{ {
bgbvr cookie = { ber, BvVec }; bgbvr cookie = { BvVec };
cookie.ber = ber;
cookie.res.bv = va_arg( ap, struct berval *** ); cookie.res.bv = va_arg( ap, struct berval *** );
cookie.alloc = 1; cookie.alloc = 1;
rc = ber_get_stringbvr( &cookie, 0 ); rc = ber_get_stringbvr( &cookie, 0 );
@ -747,7 +749,8 @@ ber_scanf ( BerElement *ber,
case 'W': /* bvarray */ case 'W': /* bvarray */
{ {
bgbvr cookie = { ber, BvArray }; bgbvr cookie = { BvArray };
cookie.ber = ber;
cookie.res.ba = va_arg( ap, struct berval ** ); cookie.res.ba = va_arg( ap, struct berval ** );
cookie.alloc = 1; cookie.alloc = 1;
rc = ber_get_stringbvr( &cookie, 0 ); rc = ber_get_stringbvr( &cookie, 0 );
@ -760,7 +763,8 @@ ber_scanf ( BerElement *ber,
* len ptr on finish. parsed in-place. * len ptr on finish. parsed in-place.
*/ */
{ {
bgbvr cookie = { ber, BvOff }; bgbvr cookie = { BvOff };
cookie.ber = ber;
cookie.res.ba = va_arg( ap, struct berval ** ); cookie.res.ba = va_arg( ap, struct berval ** );
cookie.alloc = 0; cookie.alloc = 0;
l = va_arg( ap, ber_len_t * ); l = va_arg( ap, ber_len_t * );