Merge pull request #1010 from hintjens/master

Solved some minor clusiness

Author: jemc

api/zframe.xml

@@ -24,6 +24,12 @@
         <return type = "zframe" fresh = "1" />
     </method>
 
+    <method name = "from" singleton = "1">
+        Create a frame with a specified string content.
+        <argument name = "string" type = "string" />
+        <return type = "zframe" fresh = "1" />
+    </method>
+
     <method name = "recv" singleton = "1">
         Receive frame from socket, returns zframe_t object or NULL if the recv
         was interrupted. Does a blocking recv, if you want to not block then use
@@ -82,7 +88,7 @@
     </method>
 
     <method name = "set more">
-        Set frame MORE indicator (1 or 0). Note this is NOT used when sending 
+        Set frame MORE indicator (1 or 0). Note this is NOT used when sending
         frame to socket, you have to specify flag explicitly.
         <argument name = "more" type = "integer" />
     </method>

bindings/python/czmq.py

@@ -656,6 +656,8 @@ def test(verbose):
 lib.zframe_destroy.argtypes = [POINTER(zframe_p)]
 lib.zframe_new_empty.restype = zframe_p
 lib.zframe_new_empty.argtypes = []
+lib.zframe_from.restype = zframe_p
+lib.zframe_from.argtypes = [c_char_p]
 lib.zframe_recv.restype = zframe_p
 lib.zframe_recv.argtypes = [c_void_p]
 lib.zframe_send.restype = c_int
@@ -726,6 +728,11 @@ def new_empty():
         """Create an empty (zero-sized) frame"""
         return Zframe(lib.zframe_new_empty(), True)
 
+    @staticmethod
+    def from(string):
+        """Create a frame with a specified string content."""
+        return Zframe(lib.zframe_from(string), True)
+
     @staticmethod
     def recv(source):
         """Receive frame from socket, returns zframe_t object or NULL if the recv
@@ -772,7 +779,7 @@ def more(self):
         return lib.zframe_more(self._as_parameter_)
 
     def set_more(self, more):
-        """Set frame MORE indicator (1 or 0). Note this is NOT used when sending 
+        """Set frame MORE indicator (1 or 0). Note this is NOT used when sending
 frame to socket, you have to specify flag explicitly."""
         return lib.zframe_set_more(self._as_parameter_, more)
 

bindings/qml/src/QmlZframe.cpp

@@ -63,8 +63,8 @@ int QmlZframe::more () {
 };
 
 ///
-//  Set frame MORE indicator (1 or 0). Note this is NOT used when sending 
-//  frame to socket, you have to specify flag explicitly.                 
+//  Set frame MORE indicator (1 or 0). Note this is NOT used when sending
+//  frame to socket, you have to specify flag explicitly.                
 void QmlZframe::setMore (int more) {
     zframe_set_more (self, more);
 };
@@ -103,6 +103,14 @@ QmlZframe *QmlZframeAttached::newEmpty () {
     return retQ_;
 };
 
+///
+//  Create a frame with a specified string content.
+QmlZframe *QmlZframeAttached::from (const QString &string) {
+    QmlZframe *retQ_ = new QmlZframe ();
+    retQ_->self = zframe_from (string.toUtf8().data());
+    return retQ_;
+};
+
 ///
 //  Receive frame from socket, returns zframe_t object or NULL if the recv  
 //  was interrupted. Does a blocking recv, if you want to not block then use

bindings/qml/src/QmlZframe.h

@@ -53,8 +53,8 @@ public slots:
     //  or by the zframe_set_more() method                                      
     int more ();
 
-    //  Set frame MORE indicator (1 or 0). Note this is NOT used when sending 
-    //  frame to socket, you have to specify flag explicitly.                 
+    //  Set frame MORE indicator (1 or 0). Note this is NOT used when sending
+    //  frame to socket, you have to specify flag explicitly.                
     void setMore (int more);
 
     //  Return TRUE if two frames have identical size and data
@@ -83,6 +83,9 @@ public slots:
     //  Create an empty (zero-sized) frame
     QmlZframe *newEmpty ();
 
+    //  Create a frame with a specified string content.
+    QmlZframe *from (const QString &string);
+
     //  Receive frame from socket, returns zframe_t object or NULL if the recv  
     //  was interrupted. Does a blocking recv, if you want to not block then use
     //  zpoller or zloop.                                                       

bindings/ruby/lib/czmq/ffi.rb

@@ -106,6 +106,7 @@ def self.available?
       attach_function :zframe_new, [:pointer, :size_t], :pointer, **opts
       attach_function :zframe_destroy, [:pointer], :void, **opts
       attach_function :zframe_new_empty, [], :pointer, **opts
+      attach_function :zframe_from, [:string], :pointer, **opts
       attach_function :zframe_recv, [:pointer], :pointer, **opts
       attach_function :zframe_send, [:pointer, :pointer, :int], :int, **opts
       attach_function :zframe_size, [:pointer], :size_t, **opts

bindings/ruby/lib/czmq/ffi/zframe.rb

@@ -74,6 +74,14 @@ def self.new_empty
         result
       end
 
+      # Create a frame with a specified string content.
+      def self.from string
+        string = String(string)
+        result = ::CZMQ::FFI.zframe_from string
+        result = Zframe.__new result, true
+        result
+      end
+      
       # Receive frame from socket, returns zframe_t object or NULL if the recv  
       # was interrupted. Does a blocking recv, if you want to not block then use
       # zpoller or zloop.                                                       
@@ -147,8 +155,8 @@ def more
         result
       end
 
-      # Set frame MORE indicator (1 or 0). Note this is NOT used when sending 
-      # frame to socket, you have to specify flag explicitly.                 
+      # Set frame MORE indicator (1 or 0). Note this is NOT used when sending
+      # frame to socket, you have to specify flag explicitly.                
       def set_more more
         raise DestroyedError unless @ptr
         more = Integer(more)

include/zframe.h

@@ -40,6 +40,11 @@ CZMQ_EXPORT void
 CZMQ_EXPORT zframe_t *
     zframe_new_empty ();
 
+//  Create a frame with a specified string content.
+//  The caller is responsible for destroying the return value when finished with it.
+CZMQ_EXPORT zframe_t *
+    zframe_from (const char *string);
+
 //  Receive frame from socket, returns zframe_t object or NULL if the recv  
 //  was interrupted. Does a blocking recv, if you want to not block then use
 //  zpoller or zloop.                                                       
@@ -87,8 +92,8 @@ CZMQ_EXPORT bool
 CZMQ_EXPORT int
     zframe_more (zframe_t *self);
 
-//  Set frame MORE indicator (1 or 0). Note this is NOT used when sending 
-//  frame to socket, you have to specify flag explicitly.                 
+//  Set frame MORE indicator (1 or 0). Note this is NOT used when sending
+//  frame to socket, you have to specify flag explicitly.                
 CZMQ_EXPORT void
     zframe_set_more (zframe_t *self, int more);
 

include/zlistx.h

@@ -23,33 +23,33 @@ extern "C" {
 //  Create a new, empty list.
 CZMQ_EXPORT zlistx_t *
     zlistx_new (void);
-    
+
 //  Destroy a list. If an item destructor was specified, all items in the
 //  list are automatically destroyed as well.
 CZMQ_EXPORT void
     zlistx_destroy (zlistx_t **self_p);
-    
+
 //  Add an item to the head of the list. Calls the item duplicator, if any,
 //  on the item. Resets cursor to list head. Returns an item handle on
 //  success, NULL if memory was exhausted.
 CZMQ_EXPORT void *
     zlistx_add_start (zlistx_t *self, void *item);
-    
+
 //  Add an item to the tail of the list. Calls the item duplicator, if any,
 //  on the item. Resets cursor to list head. Returns an item handle on
 //  success, NULL if memory was exhausted.
 CZMQ_EXPORT void *
     zlistx_add_end (zlistx_t *self, void *item);
-    
+
 //  Return the number of items in the list
 CZMQ_EXPORT size_t
     zlistx_size (zlistx_t *self);
-    
+
 //  Return the item at the head of list. If the list is empty, returns NULL.
 //  Leaves cursor pointing at the head item, or NULL if the list is empty.
 CZMQ_EXPORT void *
     zlistx_first (zlistx_t *self);
-    
+
 //  Return the next item. At the end of the list (or in an empty list),
 //  returns NULL. Use repeated zlistx_next () calls to work through the list
 //  from zlistx_first (). First time, acts as zlistx_first().
@@ -61,7 +61,7 @@ CZMQ_EXPORT void *
 //  backwards from zlistx_last (). First time, acts as zlistx_last().
 CZMQ_EXPORT void *
     zlistx_prev (zlistx_t *self);
-    
+
 //  Return the item at the tail of list. If the list is empty, returns NULL.
 //  Leaves cursor pointing at the tail item, or NULL if the list is empty.
 CZMQ_EXPORT void *
@@ -96,14 +96,21 @@ CZMQ_EXPORT void *
 CZMQ_EXPORT void *
     zlistx_detach (zlistx_t *self, void *handle);
 
+//  Detach item at the cursor, if any, from the list. The item is not modified,
+//  and the caller is responsible for destroying it as necessary. Returns item
+//  that was detached, or null if none was. Moves cursor to previous item, so
+//  you can detach items while iterating forwards through a list.
+CZMQ_EXPORT void *
+    zlistx_detach_cur (zlistx_t *self);
+
 //  Delete an item, using its handle. Calls the item destructor is any is
 //  set. If handle is null, deletes the first item on the list. Returns 0
 //  if an item was deleted, -1 if not. If cursor was at item, moves cursor
 //  to previous item, so you can delete items while iterating forwards
 //  through a list.
 CZMQ_EXPORT int
     zlistx_delete (zlistx_t *self, void *handle);
-    
+
 //  Move an item to the start of the list, via its handle.
 CZMQ_EXPORT void
     zlistx_move_start (zlistx_t *self, void *handle);
@@ -116,13 +123,13 @@ CZMQ_EXPORT void
 //  is set.
 CZMQ_EXPORT void
     zlistx_purge (zlistx_t *self);
-    
+
 //  Sort the list. If an item comparator was set, calls that to compare
 //  items, otherwise compares on item value. The sort is not stable, so may
 //  reorder equal items.
 CZMQ_EXPORT void
     zlistx_sort (zlistx_t *self);
-    
+
 //  Create a new node and insert it into a sorted list. Calls the item
 //  duplicator, if any, on the item. If low_value is true, starts searching
 //  from the start of the list, otherwise searches from the end. Use the item
@@ -131,7 +138,7 @@ CZMQ_EXPORT void
 //  list head.
 CZMQ_EXPORT void *
     zlistx_insert (zlistx_t *self, void *item, bool low_value);
-    
+
 //  Move an item, specified by handle, into position in a sorted list. Uses
 //  the item comparator, if any, to determine the new location. If low_value
 //  is true, starts searching from the start of the list, otherwise searches
@@ -149,7 +156,7 @@ CZMQ_EXPORT zlistx_t *
 //  freed when the list is destroyed.
 CZMQ_EXPORT void
     zlistx_set_destructor (zlistx_t *self, czmq_destructor destructor);
-    
+
 //  Set a user-defined duplicator for list items; by default items are not
 //  copied when the list is duplicated.
 CZMQ_EXPORT void

src/czmq_selftest.c

@@ -33,47 +33,47 @@ main (int argc, char *argv [])
 
     printf ("Running czmq selftests...\n");
 
-    zactor_test (verbose); 
-    zauth_test (verbose); 
-    zarmour_test (verbose); 
-    zbeacon_test (verbose); 
-    zcert_test (verbose); 
-    zcertstore_test (verbose); 
-    zchunk_test (verbose); 
-    zclock_test (verbose); 
-    zconfig_test (verbose); 
-    zdigest_test (verbose); 
-    zdir_test (verbose); 
-    zdir_patch_test (verbose); 
-    zfile_test (verbose); 
-    zframe_test (verbose); 
-    zgossip_test (verbose); 
-    zhashx_test (verbose); 
-    ziflist_test (verbose); 
-    zlistx_test (verbose); 
-    zloop_test (verbose); 
-    zmonitor_test (verbose); 
-    zmsg_test (verbose); 
-    zpoller_test (verbose); 
-    zproxy_test (verbose); 
-    zrex_test (verbose); 
-    zsock_test (verbose); 
-    zsock_option_test (verbose); 
-    zstr_test (verbose); 
-    zsys_test (verbose); 
-    zuuid_test (verbose); 
-    zgossip_msg_test (verbose); 
-    zauth_v2_test (verbose); 
-    zbeacon_v2_test (verbose); 
-    zctx_test (verbose); 
-    zhash_test (verbose); 
-    zlist_test (verbose); 
-    zmonitor_v2_test (verbose); 
-    zmutex_test (verbose); 
-    zproxy_v2_test (verbose); 
-    zsocket_test (verbose); 
-    zsockopt_test (verbose); 
-    zthread_test (verbose); 
+    zactor_test (verbose);
+    zauth_test (verbose);
+    zarmour_test (verbose);
+    zbeacon_test (verbose);
+    zcert_test (verbose);
+    zcertstore_test (verbose);
+    zchunk_test (verbose);
+    zclock_test (verbose);
+    zconfig_test (verbose);
+    zdigest_test (verbose);
+    zdir_test (verbose);
+    zdir_patch_test (verbose);
+    zfile_test (verbose);
+    zframe_test (verbose);
+    zgossip_test (verbose);
+    zhashx_test (verbose);
+    ziflist_test (verbose);
+    zlistx_test (verbose);
+    zloop_test (verbose);
+    zmonitor_test (verbose);
+    zmsg_test (verbose);
+    zpoller_test (verbose);
+    zproxy_test (verbose);
+    zrex_test (verbose);
+    zsock_test (verbose);
+    zsock_option_test (verbose);
+    zstr_test (verbose);
+    zsys_test (verbose);
+    zuuid_test (verbose);
+    zgossip_msg_test (verbose);
+    zauth_v2_test (verbose);
+    zbeacon_v2_test (verbose);
+    zctx_test (verbose);
+    zhash_test (verbose);
+    zlist_test (verbose);
+    zmonitor_v2_test (verbose);
+    zmutex_test (verbose);
+    zproxy_v2_test (verbose);
+    zsocket_test (verbose);
+    zsockopt_test (verbose);
+    zthread_test (verbose);
 
     printf ("Tests passed OK\n");
     return 0;

src/zframe.c

@@ -61,7 +61,7 @@ zframe_new (const void *data, size_t size)
 
 
 //  --------------------------------------------------------------------------
-//  Create an empty (zero-sized) frame. The caller is responsible for 
+//  Create an empty (zero-sized) frame. The caller is responsible for
 //  destroying the return value when finished with it.
 
 zframe_t *
@@ -94,6 +94,17 @@ zframe_destroy (zframe_t **self_p)
 }
 
 
+//  --------------------------------------------------------------------------
+//  Create a frame with a specified string content.
+//  The caller is responsible for destroying the return value when finished with it.
+
+zframe_t *
+zframe_from (const char *string)
+{
+    return zframe_new (string, strlen (string));
+}
+
+
 //  --------------------------------------------------------------------------
 //  Receive frame from socket, returns zframe_t object or NULL if the recv
 //  was interrupted. Does a blocking recv, if you want to not block then use
@@ -254,7 +265,7 @@ zframe_streq (zframe_t *self, const char *string)
     assert (zframe_is (self));
 
     if (zframe_size (self) == strlen (string)
-    && memcmp (zframe_data (self), string, strlen (string)) == 0) 
+    && memcmp (zframe_data (self), string, strlen (string)) == 0)
         return true;
     else
         return false;