czmq-ffi-gen 0.13.0-x64-mingw32 → 0.14.1-x64-mingw32

data/vendor/local/include/zdir_patch.h

@@ -39,7 +39,7 @@ CZMQ_EXPORT void
     zdir_patch_destroy (zdir_patch_t **self_p);
 
 //  Create copy of a patch. If the patch is null, or memory was exhausted,
-//  returns null.                                                         
+//  returns null.
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT zdir_patch_t *
     zdir_patch_dup (zdir_patch_t *self);

data/vendor/local/include/zfile.h

@@ -27,7 +27,7 @@ extern "C" {
 //  links, which are files with the extension ".ln". A symbolic link is a
 //  text file containing one line, the filename of a target file. Reading
 //  data from the symbolic link actually reads from the target file. Path
-//  may be NULL, in which case it is not used.                           
+//  may be NULL, in which case it is not used.
 CZMQ_EXPORT zfile_t *
     zfile_new (const char *path, const char *name);
 
@@ -36,7 +36,7 @@ CZMQ_EXPORT void
     zfile_destroy (zfile_t **self_p);
 
 //  Duplicate a file item, returns a newly constructed item. If the file
-//  is null, or memory was exhausted, returns null.                     
+//  is null, or memory was exhausted, returns null.
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT zfile_t *
     zfile_dup (zfile_t *self);
@@ -45,23 +45,23 @@ CZMQ_EXPORT zfile_t *
 CZMQ_EXPORT const char *
     zfile_filename (zfile_t *self, const char *path);
 
-//  Refresh file properties from disk; this is not done automatically   
+//  Refresh file properties from disk; this is not done automatically
 //  on access methods, otherwise it is not possible to compare directory
-//  snapshots.                                                          
+//  snapshots.
 CZMQ_EXPORT void
     zfile_restat (zfile_t *self);
 
 //  Return when the file was last modified. If you want this to reflect the
-//  current situation, call zfile_restat before checking this property.    
+//  current situation, call zfile_restat before checking this property.
 CZMQ_EXPORT time_t
     zfile_modified (zfile_t *self);
 
 //  Return the last-known size of the file. If you want this to reflect the
-//  current situation, call zfile_restat before checking this property.    
+//  current situation, call zfile_restat before checking this property.
 CZMQ_EXPORT off_t
     zfile_cursize (zfile_t *self);
 
-//  Return true if the file is a directory. If you want this to reflect   
+//  Return true if the file is a directory. If you want this to reflect
 //  any external changes, call zfile_restat before checking this property.
 CZMQ_EXPORT bool
     zfile_is_directory (zfile_t *self);
@@ -72,24 +72,24 @@ CZMQ_EXPORT bool
     zfile_is_regular (zfile_t *self);
 
 //  Return true if the file is readable by this process. If you want this to
-//  reflect any external changes, call zfile_restat before checking this    
-//  property.                                                               
+//  reflect any external changes, call zfile_restat before checking this
+//  property.
 CZMQ_EXPORT bool
     zfile_is_readable (zfile_t *self);
 
-//  Return true if the file is writeable by this process. If you want this 
+//  Return true if the file is writeable by this process. If you want this
 //  to reflect any external changes, call zfile_restat before checking this
-//  property.                                                              
+//  property.
 CZMQ_EXPORT bool
     zfile_is_writeable (zfile_t *self);
 
 //  Check if file has stopped changing and can be safely processed.
-//  Updates the file statistics from disk at every call.           
+//  Updates the file statistics from disk at every call.
 CZMQ_EXPORT bool
     zfile_is_stable (zfile_t *self);
 
 //  Return true if the file was changed on disk since the zfile_t object
-//  was created, or the last zfile_restat() call made on it.            
+//  was created, or the last zfile_restat() call made on it.
 CZMQ_EXPORT bool
     zfile_has_changed (zfile_t *self);
 
@@ -97,19 +97,19 @@ CZMQ_EXPORT bool
 CZMQ_EXPORT void
     zfile_remove (zfile_t *self);
 
-//  Open file for reading                             
+//  Open file for reading
 //  Returns 0 if OK, -1 if not found or not accessible
 CZMQ_EXPORT int
     zfile_input (zfile_t *self);
 
-//  Open file for writing, creating directory if needed               
+//  Open file for writing, creating directory if needed
 //  File is created if necessary; chunks can be written to file at any
-//  location. Returns 0 if OK, -1 if error.                           
+//  location. Returns 0 if OK, -1 if error.
 CZMQ_EXPORT int
     zfile_output (zfile_t *self);
 
 //  Read chunk from file at specified position. If this was the last chunk,
-//  sets the eof property. Returns a null chunk in case of error.          
+//  sets the eof property. Returns a null chunk in case of error.
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT zchunk_t *
     zfile_read (zfile_t *self, size_t bytes, off_t offset);
@@ -119,12 +119,12 @@ CZMQ_EXPORT bool
     zfile_eof (zfile_t *self);
 
 //  Write chunk to file at specified position
-//  Return 0 if OK, else -1                  
+//  Return 0 if OK, else -1
 CZMQ_EXPORT int
     zfile_write (zfile_t *self, zchunk_t *chunk, off_t offset);
 
 //  Read next line of text from file. Returns a pointer to the text line,
-//  or NULL if there was nothing more to read from the file.             
+//  or NULL if there was nothing more to read from the file.
 CZMQ_EXPORT const char *
     zfile_readln (zfile_t *self);
 
@@ -144,6 +144,14 @@ CZMQ_EXPORT const char *
 CZMQ_EXPORT void
     zfile_test (bool verbose);
 
+#ifdef CZMQ_BUILD_DRAFT_API
+//  *** Draft method, for development use, may change without warning ***
+//  Create new temporary file for writing via tmpfile. File is automaticaly
+//  deleted on destroy
+CZMQ_EXPORT zfile_t *
+    zfile_tmp (void);
+
+#endif // CZMQ_BUILD_DRAFT_API
 //  @end
 
 

data/vendor/local/include/zframe.h

@@ -25,13 +25,13 @@ extern "C" {
 //  is provided in stable builds.
 //  This class has draft methods, which may change over time. They are not
 //  in stable releases, by default. Use --enable-drafts to enable.
-#define ZFRAME_MORE 1                       // 
-#define ZFRAME_REUSE 2                      // 
-#define ZFRAME_DONTWAIT 4                   // 
+#define ZFRAME_MORE 1                       //
+#define ZFRAME_REUSE 2                      //
+#define ZFRAME_DONTWAIT 4                   //
 
 //  Create a new frame. If size is not null, allocates the frame data
-//  to the specified size. If additionally, data is not null, copies 
-//  size octets from the specified data into the frame body.         
+//  to the specified size. If additionally, data is not null, copies
+//  size octets from the specified data into the frame body.
 CZMQ_EXPORT zframe_t *
     zframe_new (const void *data, size_t size);
 
@@ -43,9 +43,9 @@ CZMQ_EXPORT zframe_t *
 CZMQ_EXPORT zframe_t *
     zframe_from (const char *string);
 
-//  Receive frame from socket, returns zframe_t object or NULL if the recv  
+//  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.                                                       
+//  zpoller or zloop.
 CZMQ_EXPORT zframe_t *
     zframe_recv (void *source);
 
@@ -54,7 +54,7 @@ CZMQ_EXPORT void
     zframe_destroy (zframe_t **self_p);
 
 //  Send a frame to a socket, destroy frame after sending.
-//  Return -1 on error, 0 on success.                     
+//  Return -1 on error, 0 on success.
 CZMQ_EXPORT int
     zframe_send (zframe_t **self_p, void *dest, int flags);
 
@@ -66,25 +66,26 @@ CZMQ_EXPORT size_t
 CZMQ_EXPORT byte *
     zframe_data (zframe_t *self);
 
-//  Return meta data property for frame           
-//  Caller must free string when finished with it.
+//  Return meta data property for frame
+//  The caller shall not modify or free the returned value, which shall be
+//  owned by the message.
 CZMQ_EXPORT const char *
     zframe_meta (zframe_t *self, const char *property);
 
 //  Create a new frame that duplicates an existing frame. If frame is null,
-//  or memory was exhausted, returns null.                                 
+//  or memory was exhausted, returns null.
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT zframe_t *
     zframe_dup (zframe_t *self);
 
 //  Return frame data encoded as printable hex string, useful for 0MQ UUIDs.
-//  Caller must free string when finished with it.                          
+//  Caller must free string when finished with it.
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT char *
     zframe_strhex (zframe_t *self);
 
 //  Return frame data copied into freshly allocated string
-//  Caller must free string when finished with it.        
+//  Caller must free string when finished with it.
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT char *
     zframe_strdup (zframe_t *self);
@@ -94,17 +95,17 @@ CZMQ_EXPORT bool
     zframe_streq (zframe_t *self, const char *string);
 
 //  Return frame MORE indicator (1 or 0), set when reading frame from socket
-//  or by the zframe_set_more() method                                      
+//  or by the zframe_set_more() method
 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.                
+//  frame to socket, you have to specify flag explicitly.
 CZMQ_EXPORT void
     zframe_set_more (zframe_t *self, int more);
 
 //  Return TRUE if two frames have identical size and data
-//  If either frame is NULL, equality is always false.    
+//  If either frame is NULL, equality is always false.
 CZMQ_EXPORT bool
     zframe_eq (zframe_t *self, zframe_t *other);
 
@@ -112,7 +113,7 @@ CZMQ_EXPORT bool
 CZMQ_EXPORT void
     zframe_reset (zframe_t *self, const void *data, size_t size);
 
-//  Send message to zsys log sink (may be stdout, or system facility as       
+//  Send message to zsys log sink (may be stdout, or system facility as
 //  configured by zsys_set_logstream). Prefix shows before frame, if not null.
 CZMQ_EXPORT void
     zframe_print (zframe_t *self, const char *prefix);
@@ -128,13 +129,13 @@ CZMQ_EXPORT void
 #ifdef CZMQ_BUILD_DRAFT_API
 //  *** Draft method, for development use, may change without warning ***
 //  Return frame routing ID, if the frame came from a ZMQ_SERVER socket.
-//  Else returns zero.                                                  
+//  Else returns zero.
 CZMQ_EXPORT uint32_t
     zframe_routing_id (zframe_t *self);
 
 //  *** Draft method, for development use, may change without warning ***
 //  Set routing ID on frame. This is used if/when the frame is sent to a
-//  ZMQ_SERVER socket.                                                  
+//  ZMQ_SERVER socket.
 CZMQ_EXPORT void
     zframe_set_routing_id (zframe_t *self, uint32_t routing_id);
 
@@ -145,8 +146,8 @@ CZMQ_EXPORT const char *
 
 //  *** Draft method, for development use, may change without warning ***
 //  Set group on frame. This is used if/when the frame is sent to a
-//  ZMQ_RADIO socket.                                              
-//  Return -1 on error, 0 on success.                              
+//  ZMQ_RADIO socket.
+//  Return -1 on error, 0 on success.
 CZMQ_EXPORT int
     zframe_set_group (zframe_t *self, const char *group);
 

data/vendor/local/include/zgossip.h

@@ -10,13 +10,13 @@
      * The XML model used for this code generation: zgossip.xml, or
      * The code generation script that built this file: zproto_server_c
     ************************************************************************
-    Copyright (c) the Contributors as noted in the AUTHORS file.       
-    This file is part of CZMQ, the high-level C binding for 0MQ:       
-    http://czmq.zeromq.org.                                            
-                                                                       
+    Copyright (c) the Contributors as noted in the AUTHORS file.
+    This file is part of CZMQ, the high-level C binding for 0MQ:
+    http://czmq.zeromq.org.
+
     This Source Code Form is subject to the terms of the Mozilla Public
     License, v. 2.0. If a copy of the MPL was not distributed with this
-    file, You can obtain one at http://mozilla.org/MPL/2.0/.           
+    file, You can obtain one at http://mozilla.org/MPL/2.0/.
     =========================================================================
 */
 

data/vendor/local/include/zgossip_engine.inc

@@ -10,16 +10,22 @@
      * The XML model used for this code generation: zgossip.xml, or
      * The code generation script that built this file: zproto_server_c
     ************************************************************************
-    Copyright (c) the Contributors as noted in the AUTHORS file.       
-    This file is part of CZMQ, the high-level C binding for 0MQ:       
-    http://czmq.zeromq.org.                                            
-                                                                       
+    Copyright (c) the Contributors as noted in the AUTHORS file.
+    This file is part of CZMQ, the high-level C binding for 0MQ:
+    http://czmq.zeromq.org.
+
     This Source Code Form is subject to the terms of the Mozilla Public
     License, v. 2.0. If a copy of the MPL was not distributed with this
-    file, You can obtain one at http://mozilla.org/MPL/2.0/.           
+    file, You can obtain one at http://mozilla.org/MPL/2.0/.
     =========================================================================
 */
 
+#ifdef NDEBUG
+#undef NDEBUG
+#endif
+
+#define ZPROTO_UNUSED(object) (void)object
+
 //  ---------------------------------------------------------------------------
 //  State machine constants
 
@@ -113,10 +119,14 @@ static void
     server_terminate (server_t *self);
 static zmsg_t *
     server_method (server_t *self, const char *method, zmsg_t *msg);
+static void
+    server_configuration (server_t *self, zconfig_t *config);
 static int
     client_initialize (client_t *self);
 static void
     client_terminate (client_t *self);
+static void
+    s_server_config_global (s_server_t *server);
 static void
     s_client_execute (s_client_t *client, event_t event);
 static int
@@ -237,15 +247,29 @@ engine_handle_socket (server_t *server, void *sock, zloop_reader_fn handler)
 }
 
 //  Register monitor function that will be called at regular intervals
-//  by the server engine
+//  by the server engine. Returns an identifier that can be used to cancel it.
 
-static void
+static int
 engine_set_monitor (server_t *server, size_t interval, zloop_timer_fn monitor)
 {
     if (server) {
         s_server_t *self = (s_server_t *) server;
         int rc = zloop_timer (self->loop, interval, 0, monitor, self);
         assert (rc >= 0);
+        return rc;
+    }
+
+    return -1;
+}
+
+//  Cancel the monitor function with the given identifier.
+static void
+engine_cancel_monitor (server_t *server, int identifier)
+{
+    if (server) {
+        s_server_t *self = (s_server_t *) server;
+        int rc = zloop_timer_end (self->loop, identifier);
+        assert (rc >= 0);
     }
 }
 
@@ -257,7 +281,7 @@ engine_set_log_prefix (client_t *client, const char *string)
 {
     if (client) {
         s_client_t *self = (s_client_t *) client;
-        snprintf (self->log_prefix, sizeof (self->log_prefix) - 1,
+        snprintf (self->log_prefix, sizeof (self->log_prefix),
             "%6d:%-33s", self->unique_id, string);
     }
 }
@@ -272,6 +296,7 @@ engine_configure (server_t *server, const char *path, const char *value)
     if (server) {
         s_server_t *self = (s_server_t *) server;
         zconfig_put (self->config, path, value);
+        s_server_config_global (self);
     }
 }
 
@@ -300,6 +325,7 @@ s_satisfy_pedantic_compilers (void)
     engine_broadcast_event (NULL, NULL, NULL_event);
     engine_handle_socket (NULL, 0, NULL);
     engine_set_monitor (NULL, 0, NULL);
+    engine_cancel_monitor (NULL, 0);
     engine_set_log_prefix (NULL, NULL);
     engine_configure (NULL, NULL, NULL);
     engine_verbose (NULL);
@@ -641,6 +667,8 @@ s_client_handle_ticket (zloop_t *loop, int timer_id, void *argument)
 static int
 s_client_handle_wakeup (zloop_t *loop, int timer_id, void *argument)
 {
+    ZPROTO_UNUSED(loop);
+    ZPROTO_UNUSED(timer_id);
     s_client_t *self = (s_client_t *) argument;
     s_client_execute (self, self->wakeup_event);
     return 0;
@@ -656,17 +684,17 @@ s_server_config_global (s_server_t *self)
     //
     //  If we didn't already set verbose, check if the config tree wants it
     if (!self->verbose
-    && atoi (zconfig_resolve (self->config, "server/verbose", "0")))
+    && atoi (zconfig_get (self->config, "server/verbose", "0")))
         self->verbose = true;
 
     //  Default client timeout is 60 seconds
     self->timeout = atoi (
-        zconfig_resolve (self->config, "server/timeout", "60000"));
+        zconfig_get (self->config, "server/timeout", "60000"));
     zloop_set_ticket_delay (self->loop, self->timeout);
 
     //  Do we want to run server in the background?
     int background = atoi (
-        zconfig_resolve (self->config, "server/background", "0"));
+        zconfig_get (self->config, "server/background", "0"));
     if (!background)
         zsys_set_logstream (stdout);
 }
@@ -740,15 +768,15 @@ s_server_config_service (s_server_t *self)
             zsys_notice ("%s", zconfig_value (section));
         else
         if (streq (zconfig_name (section), "bind")) {
-            char *endpoint = zconfig_resolve (section, "endpoint", "?");
+            char *endpoint = zconfig_get (section, "endpoint", "?");
             if (zsock_bind (self->router, "%s", endpoint) == -1)
                 zsys_warning ("could not bind to %s (%s)", endpoint, zmq_strerror (zmq_errno ()));
         }
 #if (ZMQ_VERSION_MAJOR >= 4)
         else
         if (streq (zconfig_name (section), "security")) {
-            char *mechanism = zconfig_resolve (section, "mechanism", "null");
-            char *domain = zconfig_resolve (section, "domain", NULL);
+            char *mechanism = zconfig_get (section, "mechanism", "null");
+            char *domain = zconfig_get (section, "domain", NULL);
             if (streq (mechanism, "null")) {
                 zsys_notice ("server is using NULL security");
                 if (domain)
@@ -759,6 +787,22 @@ s_server_config_service (s_server_t *self)
                 zsys_notice ("server is using PLAIN security");
                 zsock_set_plain_server (self->router, 1);
             }
+#ifdef CZMQ_BUILD_DRAFT_API
+            // TODO- zproto
+            // https://github.com/zeromq/zproto/blob/master/src/zproto_server_c.gsl#L883
+            else
+            if (streq (mechanism, "curve")) {
+                zsys_notice ("using CURVE security");
+                const char *keyfile = zconfig_get (section, "secret-key", NULL);
+                assert (keyfile);
+
+                zcert_t *server_cert = zcert_load(keyfile);
+                assert (server_cert);
+
+                zcert_apply (server_cert, self->router);
+                zsock_set_curve_server (self->router, 1);
+            }
+#endif
             else
                 zsys_warning ("mechanism=%s is not supported", mechanism);
         }
@@ -773,6 +817,9 @@ s_server_config_service (s_server_t *self)
 static int
 s_server_handle_pipe (zloop_t *loop, zsock_t *reader, void *argument)
 {
+    ZPROTO_UNUSED(loop);
+    ZPROTO_UNUSED(reader);
+
     s_server_t *self = (s_server_t *) argument;
     zmsg_t *msg = zmsg_recv (self->pipe);
     if (!msg)
@@ -786,7 +833,7 @@ s_server_handle_pipe (zloop_t *loop, zsock_t *reader, void *argument)
     else
     if (streq (method, "$TERM")) {
         //  Shutdown the engine
-        free (method);
+        zstr_free (&method);
         zmsg_destroy (&msg);
         return -1;
     }
@@ -794,10 +841,30 @@ s_server_handle_pipe (zloop_t *loop, zsock_t *reader, void *argument)
     if (streq (method, "BIND")) {
         //  Bind to a specified endpoint, which may use an ephemeral port
         char *endpoint = zmsg_popstr (msg);
+
+#ifdef CZMQ_BUILD_DRAFT_API
+        // TODO- expose self->router to application context ?
+        // Add secret|public|zap to gsl(?)
+        // move this block to custom server function when both keys are present
+        if (self->server.secret_key) {
+            zsock_set_zap_domain (self->router, self->server.zap_domain);
+            zcert_t *cert = zcert_new_from_txt(self->server.public_key, self->server.secret_key);
+            zcert_apply(cert, self->router);
+            zsock_set_curve_server (self->router, 1);
+            zcert_destroy(&cert);
+        }
+        // TODO- add this test in zproto_server_c.gsl
+#ifndef ZMQ_CURVE
+        // zmq legacy
+        bool ZMQ_CURVE = false;
+#endif
+        if (self->server.secret_key)
+            assert (zsock_mechanism (self->router) == ZMQ_CURVE);
+#endif
         self->port = zsock_bind (self->router, "%s", endpoint);
         if (self->port == -1)
             zsys_warning ("could not bind to %s", endpoint);
-        free (endpoint);
+        zstr_free (&endpoint);
     }
     else
     if (streq (method, "PORT")) {
@@ -813,12 +880,13 @@ s_server_handle_pipe (zloop_t *loop, zsock_t *reader, void *argument)
         if (self->config) {
             s_server_config_service (self);
             self->server.config = self->config;
+            server_configuration (&self->server, self->config);
         }
         else {
             zsys_warning ("cannot load config file '%s'", filename);
             self->config = zconfig_new ("root", NULL);
         }
-        free (filename);
+        zstr_free (&filename);
     }
     else
     if (streq (method, "SET")) {
@@ -830,15 +898,15 @@ s_server_handle_pipe (zloop_t *loop, zsock_t *reader, void *argument)
             self->verbose = (atoi (value) == 1);
         }
         s_server_config_global (self);
-        free (path);
-        free (value);
+        zstr_free (&value);
+        zstr_free (&path);
     }
     else
     if (streq (method, "SAVE")) {
         char *filename = zmsg_popstr (msg);
         if (zconfig_save (self->config, filename))
             zsys_warning ("cannot save config file '%s'", filename);
-        free (filename);
+        zstr_free (&filename);
     }
     else {
         //  Execute custom method
@@ -846,7 +914,7 @@ s_server_handle_pipe (zloop_t *loop, zsock_t *reader, void *argument)
         //  If reply isn't null, send it to caller
         zmsg_send (&reply, self->pipe);
     }
-    free (method);
+    zstr_free (&method);
     zmsg_destroy (&msg);
     return 0;
 }
@@ -856,13 +924,18 @@ s_server_handle_pipe (zloop_t *loop, zsock_t *reader, void *argument)
 static int
 s_server_handle_protocol (zloop_t *loop, zsock_t *reader, void *argument)
 {
+    ZPROTO_UNUSED(loop);
+    ZPROTO_UNUSED(reader);
+
     s_server_t *self = (s_server_t *) argument;
     //  We process as many messages as we can, to reduce the overhead
     //  of polling and the reactor:
     while (zsock_events (self->router) & ZMQ_POLLIN) {
-        if (zgossip_msg_recv (self->message, self->router))
+        int rc = zgossip_msg_recv (self->message, self->router);
+        if (rc == -1)
             return -1;      //  Interrupted; exit zloop
 
+
         //  TODO: use binary hashing on routing_id
         char *hashkey = zframe_strhex (zgossip_msg_routing_id (self->message));
         s_client_t *client = (s_client_t *) zhash_lookup (self->clients, hashkey);
@@ -876,6 +949,10 @@ s_server_handle_protocol (zloop_t *loop, zsock_t *reader, void *argument)
         if (client->ticket)
             zloop_ticket_reset (self->loop, client->ticket);
 
+        if (rc == -2) {
+            continue;       //  Malformed, but malformed_event doesn't exist
+                            //  -> discard the message
+        }
         //  Pass to client state machine
         s_client_execute (client, s_protocol_event (self->message));
     }
@@ -887,11 +964,15 @@ s_server_handle_protocol (zloop_t *loop, zsock_t *reader, void *argument)
 static int
 s_watch_server_config (zloop_t *loop, int timer_id, void *argument)
 {
+    ZPROTO_UNUSED(loop);
+    ZPROTO_UNUSED(timer_id);
+
     s_server_t *self = (s_server_t *) argument;
     if (zconfig_has_changed (self->config)
     &&  zconfig_reload (&self->config) == 0) {
         s_server_config_service (self);
         self->server.config = self->config;
+        server_configuration (&self->server, self->config);
         zsys_notice ("reloaded configuration from %s",
             zconfig_filename (self->config));
     }