Changeset a35b458 in mainline for uspace/lib/http/src/headers.c

Timestamp:

2018-03-02T20:10:49Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

f1380b7

Parents:

3061bc1

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:38:31)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:10:49)

Message:

style: Remove trailing whitespace on _all_ lines, including empty ones, for particular file types.

Command used: tools/srepl '\s\+$' '' -- *.c *.h *.py *.sh *.s *.S *.ag

Currently, whitespace on empty lines is very inconsistent.
There are two basic choices: Either remove the whitespace, or keep empty lines
indented to the level of surrounding code. The former is AFAICT more common,
and also much easier to do automatically.

Alternatively, we could write script for automatic indentation, and use that
instead. However, if such a script exists, it's possible to use the indented
style locally, by having the editor apply relevant conversions on load/save,
without affecting remote repository. IMO, it makes more sense to adopt
the simpler rule.

File:

• uspace/lib/http/src/headers.c (modified) (17 diffs)

uspace/lib/http/src/headers.c

@@ -64 +64 @@
                 return NULL;
         }
-        
+
         header->value = str_dup(value);
         if (header->value == NULL) {
@@ -101 +101 @@
                 if (name_end)
                         recv_mark_update(rb, name_end);
-                
+
                 errno_t rc = recv_char(rb, &c, true);
                 if (rc != EOK)
                         return rc;
         } while (is_token(c));
-        
+
         if (c != ':')
                 return EINVAL;
-        
+
         return EOK;
 }
@@ -118 +118 @@
         errno_t rc = EOK;
         char c = 0;
-        
+
         /* Ignore any inline LWS */
         while (true) {
                 if (value_start)
                         recv_mark_update(rb, value_start);
-                
+
                 rc = recv_char(rb, &c, false);
                 if (rc != EOK)
                         return rc;
-                
+
                 if (c != ' ' && c != '\t')
                         break;
-                
+
                 rc = recv_char(rb, &c, true);
                 if (rc != EOK)
                         return rc;
         }
-        
+
         while (true) {
                 recv_mark_update(rb, value_end);
-                
+
                 rc = recv_char(rb, &c, true);
                 if (rc != EOK)
                         return rc;
-                
+
                 if (c != '\r' && c != '\n')
                         continue;
-                
+
                 size_t nrecv;
                 rc = recv_discard(rb, (c == '\r' ? '\n' : '\r'), &nrecv);
                 if (rc != EOK)
                         return rc;
-                
+
                 rc = recv_char(rb, &c, false);
                 if (rc != EOK)
                         return rc;
-                
+
                 if (c != ' ' && c != '\t')
                         break;
-                
+
                 /* Ignore the char */
                 rc = recv_char(rb, &c, true);
@@ -163 +163 @@
                         return rc;
         }
-        
+
         return EOK;
 }
@@ -172 +172 @@
         receive_buffer_mark_t mark_start;
         receive_buffer_mark_t mark_end;
-        
+
         recv_mark(rb, &mark_start);
         recv_mark(rb, &mark_end);
-        
+
         errno_t rc = http_header_receive_name(rb, &mark_end);
         if (rc != EOK)
                 goto end;
-        
+
         size_t name_size = mark_end.offset - mark_start.offset;
         if (size_limit > 0 && name_size > size_limit) {
@@ -185 +185 @@
                 goto end;
         }
-        
+
         char *name = NULL;
         rc = recv_cut_str(rb, &mark_start, &mark_end, &name);
         if (rc != EOK)
                 goto end;
-        
+
         rc = http_header_receive_value(rb, &mark_start, &mark_end);
         if (rc != EOK)
                 goto end_with_name;
-        
+
         size_t value_size = mark_end.offset - mark_start.offset;
         if (size_limit > 0 && (name_size + value_size) > size_limit) {
@@ -200 +200 @@
                 goto end_with_name;
         }
-        
+
         char *value = NULL;
         rc = recv_cut_str(rb, &mark_start, &mark_end, &value);
         if (rc != EOK)
                 goto end_with_name;
-        
+
         if (out_bytes_used)
                 *out_bytes_used = name_size + value_size;
-        
+
         header->name = name;
         header->value = value;
@@ -228 +228 @@
         size_t read_index = 0;
         size_t write_index = 0;
-        
+
         while (is_lws(value[read_index])) read_index++;
-        
+
         while (value[read_index] != 0) {
                 if (is_lws(value[read_index])) {
                         while (is_lws(value[read_index])) read_index++;
-                        
+
                         if (value[read_index] != 0)
                                 value[write_index++] = ' ';
-                        
+
                         continue;
                 }
-                
+
                 value[write_index++] = value[read_index++];
         }
-        
+
         value[write_index] = 0;
 }
@@ -266 +266 @@
                 if (!http_header_name_match(header->name, name))
                         continue;
-                
+
                 if (found == NULL) {
                         found = header;
@@ -274 +274 @@
                 }
         }
-        
+
         if (found == NULL)
                 return HTTP_EMISSING_HEADER;
-        
+
         *out_header = found;
         return EOK;
@@ -288 +288 @@
         if (header == NULL)
                 return ENOMEM;
-        
+
         http_headers_append_header(headers, header);
         return EOK;
@@ -300 +300 @@
         if (rc != EOK && rc != HTTP_EMISSING_HEADER)
                 return rc;
-        
+
         if (rc == HTTP_EMISSING_HEADER)
                 return http_headers_append(headers, name, value);
-        
+
         char *new_value = str_dup(value);
         if (new_value == NULL)
                 return ENOMEM;
-        
+
         free(header->value);
         header->value = new_value;
@@ -319 +319 @@
         if (rc != EOK)
                 return rc;
-        
+
         *value = header->value;
         return EOK;
@@ -329 +329 @@
         errno_t rc = EOK;
         unsigned added = 0;
-        
+
         while (true) {
                 char c = 0;
@@ -335 +335 @@
                 if (rc != EOK)
                         goto error;
-                
+
                 if (c == '\n' || c == '\r')
                         break;
-                
+
                 if (limit_count > 0 && added >= limit_count) {
                         rc = ELIMIT;
                         goto error;
                 }
-                
+
                 http_header_t *header = malloc(sizeof(http_header_t));
                 if (header == NULL) {
@@ -350 +350 @@
                 }
                 http_header_init(header);
-                
+
                 size_t header_size;
                 rc = http_header_receive(rb, header, limit_alloc, &header_size);
@@ -358 +358 @@
                 }
                 limit_alloc -= header_size;
-                
+
                 http_headers_append_header(headers, header);
                 added++;
         }
-        
+
         return EOK;
 error: