From a6a5daf30368f62f8d55d3046b191d845d017354 Mon Sep 17 00:00:00 2001 From: leitner Date: Tue, 2 May 2017 14:10:50 +0000 Subject: [PATCH] finish size_t conversion from unsigned long --- addindex.c | 2 +- asn1.h | 2 +- dumpacls.c | 2 +- dumpidx.c | 2 +- fmt_asn1OID.c | 2 +- idx2ldif.c | 2 +- ldap_match_mapped.c | 2 +- ldap_match_sre.c | 2 +- ldapclient_str.c | 6 ++++-- scan_ldapmodifyrequest.c | 3 ++- scan_ldapsearchfilter.c | 3 ++- scan_ldapsearchrequest.c | 5 +++-- t2.c | 7 ++++--- 13 files changed, 23 insertions(+), 17 deletions(-) diff --git a/addindex.c b/addindex.c index 05d9895..b5bbaf8 100644 --- a/addindex.c +++ b/addindex.c @@ -64,7 +64,7 @@ uint32 hashmapped(uint32 ofs,int ignorecase) { int main(int argc,char* argv[]) { enum { SORTEDTABLE, HASHTABLE } mode; - unsigned long filelen; + size_t filelen; char* filename=argv[1]; uint32 magic,attribute_count,record_count,indices_offset,size_of_string_table; uint32 wanted,casesensitive,dn,objectClass; diff --git a/asn1.h b/asn1.h index f74556e..56a2368 100644 --- a/asn1.h +++ b/asn1.h @@ -102,7 +102,7 @@ size_t fmt_asn1bitstring(char* dest,enum asn1_tagclass tc,enum asn1_tagtype tt, /* write ASN.1 SET */ #define fmt_asn1SET(dest,l) fmt_asn1transparent(dest,UNIVERSAL,CONSTRUCTED,SET_OF,l) -size_t fmt_asn1OID(char* dest,enum asn1_tagclass tc,enum asn1_tagtype tt,enum asn1_tag tag,const unsigned long* array,unsigned long len); +size_t fmt_asn1OID(char* dest,enum asn1_tagclass tc,enum asn1_tagtype tt,enum asn1_tag tag,const size_t* array,size_t len); /* conventions for the parser routines: diff --git a/dumpacls.c b/dumpacls.c index a97a331..cc18a61 100644 --- a/dumpacls.c +++ b/dumpacls.c @@ -8,7 +8,7 @@ #include int main(int argc,char* argv[]) { - unsigned long filelen; + size_t filelen; char* fn=argc<2?"data":argv[1]; const char* map=mmap_read(fn,&filelen); uint32 magic,attribute_count,record_count,indices_offset,size_of_string_table,acl_ofs; diff --git a/dumpidx.c b/dumpidx.c index 55a325f..a7d2bbd 100644 --- a/dumpidx.c +++ b/dumpidx.c @@ -5,7 +5,7 @@ int main(int argc,char* argv[]) { int verbose=0; - unsigned long filelen; + size_t filelen; char* fn=argc<2?"data":argv[1]; const char* map=mmap_read(fn,&filelen); uint32 magic,attribute_count,record_count,indices_offset,size_of_string_table; diff --git a/fmt_asn1OID.c b/fmt_asn1OID.c index 6f6fc10..89382e6 100644 --- a/fmt_asn1OID.c +++ b/fmt_asn1OID.c @@ -1,6 +1,6 @@ #include "asn1.h" -size_t fmt_asn1OID(char* dest,enum asn1_tagclass tc,enum asn1_tagtype tt,enum asn1_tag tag,const unsigned long* array,unsigned long len) { +size_t fmt_asn1OID(char* dest,enum asn1_tagclass tc,enum asn1_tagtype tt,enum asn1_tag tag,const size_t* array,size_t len) { size_t i,l,l2; if (len<2) return 0; for (l=1,i=2; i=max) goto error; /* need at least one record */ do { - size_t islen, etmp; + size_t islen; + unsigned long etmp; if (last) { struct Modification* cur; if (!(cur=malloc(sizeof(struct Modification)))) goto error; diff --git a/scan_ldapsearchfilter.c b/scan_ldapsearchfilter.c index 1a08141..0f3eb02 100644 --- a/scan_ldapsearchfilter.c +++ b/scan_ldapsearchfilter.c @@ -32,7 +32,8 @@ size_t scan_ldapsearchfilter(const char* src,const char* max,struct Filter** f) { enum asn1_tagclass tc; enum asn1_tagtype tt; - size_t tag,len,res,tmp; + size_t len,res,tmp; + unsigned long tag; const char* nmax; *f=0; if (!(res=scan_asn1tag(src,max,&tc,&tt,&tag))) goto error; diff --git a/scan_ldapsearchrequest.c b/scan_ldapsearchrequest.c index 0073c6a..f8a366b 100644 --- a/scan_ldapsearchrequest.c +++ b/scan_ldapsearchrequest.c @@ -7,6 +7,7 @@ size_t scan_ldapsearchrequest(const char* src,const char* max, size_t res,tmp; unsigned long etmp; signed long ltmp; + size_t stmp; s->attributes=0; s->filter=0; if (!(res=scan_ldapstring(src,max,&s->baseObject))) goto error; @@ -27,10 +28,10 @@ size_t scan_ldapsearchrequest(const char* src,const char* max, if (!(tmp=scan_ldapsearchfilter(src+res,max,&s->filter))) goto error; res+=tmp; /* now for the attributelist */ - if (!(tmp=scan_asn1SEQUENCE(src+res,max,&etmp))) goto error; + if (!(tmp=scan_asn1SEQUENCE(src+res,max,&stmp))) goto error; res+=tmp; { - const char* nmax=src+res+etmp; + const char* nmax=src+res+stmp; //#define nmax max struct AttributeDescriptionList** a=&s->attributes; if (nmax>max) goto error; diff --git a/t2.c b/t2.c index 8cf7004..ac51384 100644 --- a/t2.c +++ b/t2.c @@ -83,16 +83,17 @@ mergesub: #ifndef INCLUDE int main(int argc,char* argv[]) { #if 1 - unsigned long size; + size_t size; // char* ldapsequence=mmap_read("req",&size); const char* ldapsequence=mmap_read(argc>1?argv[1]:"/tmp/ldap/127.000.000.001.00389-127.000.000.001.38433",&size); - unsigned long messageid, op, len; + unsigned long messageid, op; + size_t len; int res; unsigned long done=0; while (done> BindRequest <<");