Changeset 4ddeace in mainline for generic/src/printf/vsnprintf.c

Timestamp:

2006-06-06T11:45:42Z (19 years ago)

Author:

Josef Cejka <malyzelenyhnus@…>

Branches:

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

Children:

99f3249

Parents:

3247f0a

Message:

Fixed printf return value.

File:

• generic/src/printf/vsnprintf.c (modified) (1 diff)

generic/src/printf/vsnprintf.c

@@ -51 +51 @@
 int vsnprintf_write(const char *str, size_t count, struct vsnprintf_data *data)
 {
-        size_t i,j;
+        size_t i;
         i = data->size - data->len;
-        j = count;
 
-        if (i > 0) {
-                if (i <= j) { 
-                        if (i == 1) {
-                                /* We have only one free byte left in buffer => write there trailing zero */
-                                data->string[data->size - 1] = 0;
-                                data->len = data->size;
-                        } else {
-                                /* We have not enought space for whole string with the trailing zero => print only a part of string */
-                                memcpy((void *)(data->string + data->len), (void *)str, i - 1);
-                                data->string[data->size - 1] = 0;
-                                data->len = data->size;
-                        }
-                } else {
-                        /* Buffer is big enought to print whole string */
-                        memcpy((void *)(data->string + data->len), (void *)str, j);
-                        data->len += j;
-                        /* Put trailing zero at end, but not count it into data->len so it could be rewritten next time */
-                        data->string[data->len] = 0;
-                }
+        if ((count == 0) || (i == 0)) {
+                return 0;
         }
         
+        if (i == 1) {
+                /* We have only one free byte left in buffer => write there trailing zero */
+                data->string[data->size - 1] = 0;
+                data->len = data->size;
+                return 1;
+        }
+        
+        if (i <= count) {
+                /* We have not enought space for whole string with the trailing zero => print only a part of string */
+                        memcpy((void *)(data->string + data->len), (void *)str, i - 1);
+                        data->string[data->size - 1] = 0;
+                        data->len = data->size;
+                        return i;
+        }
+        
+        /* Buffer is big enought to print whole string */
+        memcpy((void *)(data->string + data->len), (void *)str, count);
+        data->len += count;
+        /* Put trailing zero at end, but not count it into data->len so it could be rewritten next time */
+        data->string[data->len] = 0;
+
         return count;   
 }