Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2682)

Unified Diff: dart/runtime/bin/net/nss_memio.cc

Issue 574443002: Update NSS to 3.16.4. Updated to Chromium's copy of NSS at revision 291806 (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « dart/runtime/bin/net/nss_memio.h ('k') | dart/runtime/bin/net/sqlite.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dart/runtime/bin/net/nss_memio.cc
===================================================================
--- dart/runtime/bin/net/nss_memio.cc (revision 40429)
+++ dart/runtime/bin/net/nss_memio.cc (working copy)
@@ -9,7 +9,7 @@
// This file is a modified copy of Chromium's src/net/base/nss_memio.c.
// char* has been changed to uint8_t* everywhere, and C++ casts are used.
-// Revision 257452 (this should agree with "nss_rev" in DEPS).
+// Revision 291806 (this should agree with "nss_rev" in DEPS).
/* memio is a simple NSPR I/O layer that lets you decouple NSS from
@@ -442,17 +442,21 @@
}
}
-void memio_GetWriteParams(memio_Private *secret,
+int memio_GetWriteParams(memio_Private *secret,
const uint8_t** buf1, unsigned int *len1,
const uint8_t** buf2, unsigned int *len2) {
struct memio_buffer* mb =
&(reinterpret_cast<PRFilePrivate*>(secret)->writebuf);
PR_ASSERT(mb->bufsize);
+ if (mb->last_err)
+ return mb->last_err;
+
*buf1 = &mb->buf[mb->head];
*len1 = memio_buffer_used_contiguous(mb);
*buf2 = mb->buf;
*len2 = memio_buffer_wrapped_bytes(mb);
+ return 0;
}
void memio_PutWriteResult(memio_Private *secret, int bytes_written) {
« no previous file with comments | « dart/runtime/bin/net/nss_memio.h ('k') | dart/runtime/bin/net/sqlite.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698