Changeset d2b1040 in mainline for uspace/lib/c/generic/adt/measured_strings.c

Timestamp:

2010-10-27T20:33:51Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f4c8a83f

Parents:

6067284

Message:

Measured strings nits.

File:

• uspace/lib/c/generic/adt/measured_strings.c (modified) (19 diffs)

uspace/lib/c/generic/adt/measured_strings.c

@@ -52 +52 @@
  * @param[in] string    The initial character string to be stored.
  * @param[in] length    The length of the given string without the terminating
- *                      zero ('/0') character. If the length is zero (0), the
- *                      actual length is computed. The given length is used and
- *                      appended with the terminating zero ('\\0') character
+ *                      zero ('\0') character. If the length is zero, the actual
+ *                      length is computed. The given length is used and
+ *                      appended with the terminating zero ('\0') character
  *                      otherwise.
  * @returns             The new bundled character string with measured length.
@@ -60 +60 @@
  */
 measured_string_ref
-measured_string_create_bulk(const char * string, size_t length)
+measured_string_create_bulk(const char *string, size_t length)
 {
         measured_string_ref new;
@@ -66 +66 @@
         if (length == 0) {
                 while (string[length])
-                        ++length;
+                        length++;
         }
         new = (measured_string_ref) malloc(sizeof(measured_string_t) +
@@ -104 +104 @@
                         new->value[new->length] = '\0';
                         return new;
-                } else {
-                        free(new);
                 }
+                free(new);
         }
 
@@ -156 +155 @@
                 return EINVAL;
         }
-        if(ERROR_OCCURRED(async_data_write_finalize(callid, lengths,
-            sizeof(size_t) * (count + 1)))) {
+        if (ERROR_OCCURRED(async_data_write_finalize(callid, lengths,
+            length))) {
                 free(lengths);
                 return ERROR_CODE;
@@ -163 +162 @@
 
         *data = malloc(lengths[count]);
-        if (!(*data)) {
+        if (!*data) {
                 free(lengths);
                 return ENOMEM;
@@ -171 +170 @@
         *strings = (measured_string_ref) malloc(sizeof(measured_string_t) *
             count);
-        if (!(*strings)) {
+        if (!*strings) {
                 free(lengths);
                 free(*data);
@@ -178 +177 @@
 
         next = *data;
-        for (index = 0; index < count; ++index) {
+        for (index = 0; index < count; index++) {
                 (*strings)[index].length = lengths[index];
                 if (lengths[index] > 0) {
-                        if ((!async_data_write_receive(&callid, &length)) ||
+                        if (!async_data_write_receive(&callid, &length) ||
                             (length != lengths[index])) {
                                 free(*data);
@@ -192 +191 @@
                         (*strings)[index].value = next;
                         next += lengths[index];
-                        *next = '\0';
-                        ++next;
+                        *next++ = '\0';
                 } else {
                         (*strings)[index].value = NULL;
@@ -221 +219 @@
 
         length = 0;
-        for (index = 0; index < count; ++ index) {
+        for (index = 0; index < count; index++) {
                 lengths[index] = strings[index].length;
                 length += lengths[index] + 1;
@@ -262 +260 @@
                 return ENOMEM;
 
-        if ((!async_data_read_receive(&callid, &length)) ||
+        if (!async_data_read_receive(&callid, &length) ||
             (length != sizeof(size_t) * (count + 1))) {
                 free(lengths);
                 return EINVAL;
         }
-        if (ERROR_OCCURRED(async_data_read_finalize(callid, lengths,
-            sizeof(size_t) * (count + 1)))) {
+        if (ERROR_OCCURRED(async_data_read_finalize(callid, lengths, length))) {
                 free(lengths);
                 return ERROR_CODE;
@@ -274 +271 @@
         free(lengths);
 
-        for (index = 0; index < count; ++ index) {
+        for (index = 0; index < count; index++) {
                 if (strings[index].length > 0) {
-                        if((!async_data_read_receive(&callid, &length)) ||
+                        if (!async_data_read_receive(&callid, &length) ||
                             (length != strings[index].length)) {
                                 return EINVAL;
@@ -317 +314 @@
         char *next;
 
-        if ((phone <= 0) || (!strings) || (!data) || (count <= 0))
+        if ((phone < 0) || (!strings) || (!data) || (count <= 0))
                 return EINVAL;
 
@@ -331 +328 @@
 
         *data = malloc(lengths[count]);
-        if (!(*data)) {
+        if (!*data) {
                 free(lengths);
                 return ENOMEM;
@@ -338 +335 @@
         *strings = (measured_string_ref) malloc(sizeof(measured_string_t) *
             count);
-        if (!(*strings)) {
+        if (!*strings) {
                 free(lengths);
                 free(*data);
@@ -345 +342 @@
 
         next = *data;
-        for (index = 0; index < count; ++ index) {
+        for (index = 0; index < count; index++) {
                 (*strings)[index].length = lengths[index];
                 if (lengths[index] > 0) {
@@ -352 +349 @@
                         (*strings)[index].value = next;
                         next += lengths[index];
-                        *next = '\0';
-                        ++ next;
+                        *next++ = '\0';
                 } else {
                         (*strings)[index].value = NULL;
@@ -386 +382 @@
         size_t index;
 
-        if ((phone <= 0) || (!strings) || (count <= 0))
+        if ((phone < 0) || (!strings) || (count <= 0))
                 return EINVAL;
 
@@ -401 +397 @@
         free(lengths);
 
-        for (index = 0; index < count; ++index) {
+        for (index = 0; index < count; index++) {
                 if (strings[index].length > 0) {
                         ERROR_PROPAGATE(async_data_write_start(phone,