WebSVN – HelenOS – Diff – /branches/network/uspace/srv/net/measured_strings.c

  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /** @addtogroup net
- * @{
+ *  @{
  */
-/**
- * @file
+/** @file
+ *  A&nbsp;character string with measured length implementation file.
+ *  @see measured_strings.h
  */
 #include <errno.h>
 #include <malloc.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <ipc/ipc.h>
 #include "err.h"
 #include "measured_strings.h"
 #include "modules.h"
+/** Computes the lengths of the measured strings in the given array.
+ *  @param strings The measured strings array to be processed. Input parameter.
+ *  @param count The measured strings array size. Input parameter.
+ *  @returns The computed sizes array.
+ *  @returns NULL if there is no memory left.
+ */
-size_t *    prepare_lengths( measured_string_ref strings, size_t count );
+size_t *    prepare_lengths( const measured_string_ref strings, size_t count );
 measured_string_ref measured_string_create_bulk( const char * string, size_t length ){
     measured_string_ref new;
     if( length == 0 ){
+    }
     new = ( measured_string_ref ) malloc( sizeof( measured_string_t ) + ( sizeof( char ) * ( length + 1 )));
     if( ! new ) return NULL;
     new->length = length;
     new->value = (( char * ) new ) + sizeof( measured_string_t );
+    // append terminating zero explicitly - to be safe
-    memcpy( new->value, string, new->length + 1 );
+    memcpy( new->value, string, new->length );
+    new->value[ new->length ] = '\0';
     return new;
+}
 int measured_strings_receive( measured_string_ref * strings, char ** data, size_t count ){
     ERROR_DECLARE;
-    size_t *    lengths;
+    size_t *        lengths;
-    int     index;
+    int             index;
-    size_t      length;
+    size_t          length;
-    char *      next;
+    char *          next;
     ipc_callid_t    callid;
     if(( ! strings ) || ( ! data ) || ( count <= 0 )){
         return EINVAL;
+    }
+    }
     free( lengths );
     return EOK;
+}
-int measured_strings_reply( measured_string_ref strings, size_t count ){
+int measured_strings_reply( const measured_string_ref strings, size_t count ){
     ERROR_DECLARE;
-    size_t *    lengths;
+    size_t *        lengths;
-    int     index;
+    int             index;
-    size_t      length;
+    size_t          length;
     ipc_callid_t    callid;
     if(( ! strings ) || ( count <= 0 )){
         return EINVAL;
+    }
 int measured_strings_return( int phone, measured_string_ref * strings, char ** data, size_t count ){
     ERROR_DECLARE;
     size_t *    lengths;
-    int     index;
+    int         index;
     char *      next;
     if(( phone <= 0 ) || ( ! strings ) || ( ! data ) || ( count <= 0 )){
         return EINVAL;
+    }
+    }
     free( lengths );
     return EOK;
+}
-int measured_strings_send( int phone, measured_string_ref strings, size_t count ){
+int measured_strings_send( int phone, const measured_string_ref strings, size_t count ){
     ERROR_DECLARE;
     size_t *    lengths;
-    int     index;
+    int         index;
     if(( phone <= 0 ) || ( ! strings ) || ( count <= 0 )){
         return EINVAL;
+    }
     lengths = prepare_lengths( strings, count );
+        }
+    }
     return EOK;
+}
-size_t * prepare_lengths( measured_string_ref strings, size_t count ){
+size_t * prepare_lengths( const measured_string_ref strings, size_t count ){
     size_t *    lengths;
-    int     index;
+    int         index;
     size_t      length;
     lengths = ( size_t * ) malloc( sizeof( size_t ) * ( count + 1 ));
     if( ! lengths ) return NULL;
     length = 0;

Subversion Repositories HelenOS

(root)/branches/network/uspace/srv/net/measured_strings.c – Rev 3685 → 3846