Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Rename BroString to zeek::String

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-07-02 14:59:24 -07:00
parent a2bc42dd93
commit 736a3f53d4
58 changed files with 346 additions and 339 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Base64.cc
View file

@ -228,7 +228,7 @@ void Base64Converter::IllegalEncoding(const char* msg)
reporter->Error("%s", msg);
}
zeek::BroString* decode_base64(const zeek::BroString* s, const zeek::BroString* a, Connection* conn)
zeek::String* decode_base64(const zeek::String* s, const zeek::String* a, Connection* conn)
{
if ( a && a->Len() != 0 && a->Len() != 64 )
{
@ -255,14 +255,14 @@ zeek::BroString* decode_base64(const zeek::BroString* s, const zeek::BroString*
rlen += rlen2;
rbuf[rlen] = '\0';
return new zeek::BroString(true, (u_char*) rbuf, rlen);
return new zeek::String(true, (u_char*) rbuf, rlen);
err:
delete [] rbuf;
return nullptr;
}
zeek::BroString* encode_base64(const zeek::BroString* s, const zeek::BroString* a, Connection* conn)
zeek::String* encode_base64(const zeek::String* s, const zeek::String* a, Connection* conn)
{
if ( a && a->Len() != 0 && a->Len() != 64 )
{
@ -276,5 +276,5 @@ zeek::BroString* encode_base64(const zeek::BroString* s, const zeek::BroString*
Base64Converter enc(conn, a ? a->CheckString() : "");
enc.Encode(s->Len(), (const unsigned char*) s->Bytes(), &outlen, &outbuf);
return new zeek::BroString(true, (u_char*)outbuf, outlen);
return new zeek::String(true, (u_char*)outbuf, outlen);
}