Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
openldap
OpenLDAP
Commits
6c772f20
Commit
6c772f20
authored
Apr 01, 2006
by
Hallvard Furuseth
Browse files
assert expects int. (int)<nonnull ptr/long> can be 0. Use assert(arg!=0/NULL).
parent
581c1ff6
Changes
3
Hide whitespace changes
Inline
Side-by-side
servers/slapd/back-ldbm/index.c
View file @
6c772f20
...
...
@@ -164,7 +164,7 @@ static int indexer(
AttributeDescription
*
ad
=
NULL
;
struct
berval
*
keys
;
assert
(
mask
);
assert
(
mask
!=
0
);
rc
=
slap_bv2ad
(
atname
,
&
ad
,
&
text
);
...
...
servers/slapd/schema_init.c
View file @
6c772f20
...
...
@@ -1010,7 +1010,7 @@ uniqueMemberNormalize(
struct
berval
out
;
int
rc
;
assert
(
SLAP_MR_IS_VALUE_OF_SYNTAX
(
usage
));
assert
(
SLAP_MR_IS_VALUE_OF_SYNTAX
(
usage
)
!=
0
);
ber_dupbv_x
(
&
out
,
val
,
ctx
);
if
(
BER_BVISEMPTY
(
&
out
)
)
{
...
...
@@ -1423,7 +1423,7 @@ UTF8StringNormalize(
int
flags
;
int
i
,
wasspace
;
assert
(
SLAP_MR_IS_VALUE_OF_SYNTAX
(
use
));
assert
(
SLAP_MR_IS_VALUE_OF_SYNTAX
(
use
)
!=
0
);
if
(
BER_BVISNULL
(
val
)
)
{
/* assume we're dealing with a syntax (e.g., UTF8String)
...
...
@@ -1854,7 +1854,7 @@ telephoneNumberNormalize(
{
char
*
p
,
*
q
;
assert
(
SLAP_MR_IS_VALUE_OF_SYNTAX
(
usage
));
assert
(
SLAP_MR_IS_VALUE_OF_SYNTAX
(
usage
)
!=
0
);
/* validator should have refused an empty string */
assert
(
!
BER_BVISEMPTY
(
val
)
);
...
...
@@ -2106,7 +2106,7 @@ IA5StringNormalize(
assert
(
!
BER_BVISEMPTY
(
val
)
);
assert
(
SLAP_MR_IS_VALUE_OF_SYNTAX
(
use
));
assert
(
SLAP_MR_IS_VALUE_OF_SYNTAX
(
use
)
!=
0
);
p
=
val
->
bv_val
;
...
...
@@ -3275,7 +3275,7 @@ certificateExactNormalize(
return
serialNumberAndIssuerNormalize
(
0
,
NULL
,
NULL
,
val
,
normalized
,
ctx
);
}
assert
(
SLAP_MR_IS_VALUE_OF_ATTRIBUTE_SYNTAX
(
usage
)
);
assert
(
SLAP_MR_IS_VALUE_OF_ATTRIBUTE_SYNTAX
(
usage
)
!=
0
);
p
=
(
unsigned
char
*
)
val
->
bv_val
;
xcert
=
d2i_X509
(
NULL
,
&
p
,
val
->
bv_len
);
...
...
servers/slapd/value.c
View file @
6c772f20
...
...
@@ -229,7 +229,7 @@ int value_find_ex(
return
LDAP_INAPPROPRIATE_MATCHING
;
}
assert
(
SLAP_IS_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH
(
flags
));
assert
(
SLAP_IS_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH
(
flags
)
!=
0
);
if
(
!
SLAP_IS_MR_ASSERTED_VALUE_NORMALIZED_MATCH
(
flags
)
&&
mr
->
smr_normalize
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment