Imported Debian patch 2.0.9.dfsg-1debian/2.0.9.dfsg-1

1 files changed, 18 insertions, 8 deletions

diff --git a/doc/zmq_getsockopt.html b/doc/zmq_getsockopt.html
index 1c4dda1..9b45f1c 100644
--- a/doc/zmq_getsockopt.html
+++ b/doc/zmq_getsockopt.html
@@ -591,7 +591,7 @@ specified by the <em>option_name</em> argument for the ØMQ socket pointed to by
 <em>socket</em> argument, and store it in the buffer pointed to by the <em>option_value</em>

 argument. The <em>option_len</em> argument is the size in bytes of the buffer pointed

 to by <em>option_value</em>; upon successful completion <em>zmq_getsockopt()</em> shall

-modify the <em>option_value</em> argument to indicate the actual size of the option

+modify the <em>option_len</em> argument to indicate the actual size of the option

 value stored in the buffer.</p></div>

 <div class="paragraph"><p>The following options can be retrieved with the <em>zmq_getsockopt()</em> function:</p></div>

 <h3 id="_zmq_rcvmore_more_message_parts_to_follow">ZMQ_RCVMORE: More message parts to follow</h3><div style="clear:left"></div>

@@ -667,7 +667,7 @@ Option value type
 </td>

 <td class="hdlist2">

 <p style="margin-top: 0;">

-int64_t

+uint64_t

 </p>

 </td>

 </tr>

@@ -777,7 +777,7 @@ Option value type
 </td>

 <td class="hdlist2">

 <p style="margin-top: 0;">

-int64_t

+uint64_t

 </p>

 </td>

 </tr>

@@ -884,7 +884,7 @@ Option value type
 </td>

 <td class="hdlist2">

 <p style="margin-top: 0;">

-uint64_t

+int64_t

 </p>

 </td>

 </tr>

@@ -935,7 +935,7 @@ Option value type
 </td>

 <td class="hdlist2">

 <p style="margin-top: 0;">

-uint64_t

+int64_t

 </p>

 </td>

 </tr>

@@ -989,7 +989,7 @@ Option value type
 </td>

 <td class="hdlist2">

 <p style="margin-top: 0;">

-uint64_t

+int64_t

 </p>

 </td>

 </tr>

@@ -1157,6 +1157,14 @@ option value.
 The ØMQ <em>context</em> associated with the specified <em>socket</em> was terminated.

 </p>

 </dd>

+<dt class="hdlist1">

+<strong>EFAULT</strong>

+</dt>

+<dd>

+<p>

+The provided <em>socket</em> was not valid (NULL).

+</p>

+</dd>

 </dl></div>

 </div>

 <h2 id="_example">EXAMPLE</h2>

@@ -1166,7 +1174,8 @@ The ØMQ <em>context</em> associated with the specified <em>socket</em> was term
 <div class="content">

 <pre><tt>/* Retrieve high water mark into hwm */

 int64_t hwm;

-rc = zmq_getsockopt (socket, ZMQ_HWM, &amp;hwm, sizeof hwm);

+size_t hwm_size = sizeof (hwm);

+rc = zmq_getsockopt (socket, ZMQ_HWM, &amp;hwm, &amp;hwm_size);

 assert (rc == 0);</tt></pre>

 </div></div>

 </div>

@@ -1185,7 +1194,8 @@ Martin Lucina &lt;<a href="mailto:mato@kotelna.sk">mato@kotelna.sk</a>&gt;.</p><
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2010-06-03 14:13:06 CEST

+ØMQ 2.0.9<br />

+Last updated 2010-09-06 07:11:47 CEST

 </div>

 </div>

 </body>