josh/propane
1
0
Fork 0
Code Issues 3 Pull Requests Projects Releases Wiki Activity

updating and debugging deserialize()

Browse Source
This commit is contained in:
Josh Holtrop 2010-03-29 20:12:25 -04:00
parent 51c870b314
commit a2acb832dd
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
imbecile.cc
View File

@ -38,5 +38,11 @@ int main(int argc, char * argv[])
return 1; return 1;
} }
cout << "Size: " << ucs_str->size() << endl;
for (int i = 0; i < ucs_str->size(); i++)
{
cout << (*ucs_str)[i] << ": '" << (char) (*ucs_str)[i] << "'" << endl;
}
return 0; return 0;
} }

16
serialize.cc
View File

@ -11,7 +11,7 @@ refptr< vector<unichar_t> > deserialize(const char * encoding, istream & in)
char * inbuf_ptr = (char *) &inbuf[0]; char * inbuf_ptr = (char *) &inbuf[0];
unichar_t outbuf[buf_size]; unichar_t outbuf[buf_size];
char * outbuf_ptr; char * outbuf_ptr;
size_t bytes_converted, inbytesleft = 0, outbytesleft; size_t bytes_converted, inbytes = 0, outbytes;
refptr< vector<unichar_t> > ucs = new vector<unichar_t>(); refptr< vector<unichar_t> > ucs = new vector<unichar_t>();
iconv_t cd = iconv_open(encoding, "UTF-32"); iconv_t cd = iconv_open(encoding, "UTF-32");
@ -23,19 +23,19 @@ refptr< vector<unichar_t> > deserialize(const char * encoding, istream & in)
for (;;) for (;;)
{ {
in.read(&inbuf[0], sizeof(inbuf) - inbytesleft); in.read(inbuf_ptr, sizeof(inbuf) - inbytes);
num_read = in.gcount(); num_read = in.gcount();
if (num_read <= 0) if (num_read <= 0)
break; break;
outbuf_ptr = (char *) &outbuf[0]; outbuf_ptr = (char *) &outbuf[0];
outbytesleft = sizeof(outbuf); outbytes = sizeof(outbuf);
bytes_converted = iconv(cd, &inbuf_ptr, &inbytesleft, bytes_converted = iconv(cd, &inbuf_ptr, &inbytes,
&outbuf_ptr, &outbytesleft); &outbuf_ptr, &outbytes);
if (inbytesleft > 0) if (inbytes > 0)
{ {
memmove(&inbuf[0], inbuf_ptr, inbytesleft); memmove(&inbuf[0], inbuf_ptr, inbytes);
inbuf_ptr = (char *) &inbuf[0];
} }
inbuf_ptr = ((char *) &inbuf[0]) + inbytes;
for (int i = 0; i < (bytes_converted / sizeof(outbuf[0])); i++) for (int i = 0; i < (bytes_converted / sizeof(outbuf[0])); i++)
{ {
ucs->push_back(outbuf[i]); ucs->push_back(outbuf[i]);