Changeset a35b458 in mainline for uspace/srv/net/dnsrsrv/query.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/srv/net/dnsrsrv/query.c (modified) (11 diffs)

uspace/srv/net/dnsrsrv/query.c

@@ -54 +54 @@
         if (sname == NULL)
                 return ENOMEM;
-        
+
         char *qname = str_dup(name);
         if (qname == NULL) {
@@ -60 +60 @@
                 return ENOMEM;
         }
-        
+
         dns_question_t *question = calloc(1, sizeof(dns_question_t));
         if (question == NULL) {
@@ -67 +67 @@
                 return ENOMEM;
         }
-        
+
         question->qname = qname;
         question->qtype = qtype;
         question->qclass = DC_IN;
-        
+
         dns_message_t *msg = dns_message_new();
         if (msg == NULL) {
@@ -79 +79 @@
                 return ENOMEM;
         }
-        
+
         msg->id = msg_id++;
         msg->qr = QR_QUERY;
@@ -87 +87 @@
         msg->rd = true;
         msg->ra = false;
-        
+
         list_append(&question->msg, &msg->question);
-        
+
         log_msg(LOG_DEFAULT, LVL_DEBUG, "dns_name_query: send DNS request");
         dns_message_t *amsg;
@@ -98 +98 @@
                 return rc;
         }
-        
+
         list_foreach(amsg->answer, msg, dns_rr_t, rr) {
                 log_msg(LOG_DEFAULT, LVL_DEBUG, " - '%s' %u/%u, dsize %zu",
                     rr->name, rr->rtype, rr->rclass, rr->rdata_size);
-                
+
                 if ((rr->rtype == DTYPE_CNAME) && (rr->rclass == DC_IN) &&
                     (str_cmp(rr->name, sname) == 0)) {
-                        
+
                         log_msg(LOG_DEFAULT, LVL_DEBUG, "decode cname (%p, %zu, %zu)",
                             amsg->pdu.data, amsg->pdu.size, rr->roff);
-                        
+
                         char *cname;
                         size_t eoff;
@@ -114 +114 @@
                         if (rc != EOK) {
                                 assert((rc == EINVAL) || (rc == ENOMEM));
-                                
+
                                 log_msg(LOG_DEFAULT, LVL_DEBUG, "error decoding cname");
-                                
+
                                 dns_message_destroy(msg);
                                 dns_message_destroy(amsg);
                                 free(sname);
-                                
+
                                 return rc;
                         }
-                        
+
                         log_msg(LOG_DEFAULT, LVL_DEBUG, "name = '%s' "
                             "cname = '%s'", sname, cname);
-                        
+
                         /* Continue looking for the more canonical name */
                         free(sname);
                         sname = cname;
                 }
-                
+
                 if ((qtype == DTYPE_A) && (rr->rtype == DTYPE_A) &&
                     (rr->rclass == DC_IN) && (rr->rdata_size == sizeof(addr32_t)) &&
                     (str_cmp(rr->name, sname) == 0)) {
-                        
+
                         info->cname = str_dup(rr->name);
                         if (info->cname == NULL) {
@@ -141 +141 @@
                                 dns_message_destroy(amsg);
                                 free(sname);
-                                
+
                                 return ENOMEM;
                         }
-                        
+
                         inet_addr_set(dns_uint32_t_decode(rr->rdata, rr->rdata_size),
                             &info->addr);
-                        
+
                         dns_message_destroy(msg);
                         dns_message_destroy(amsg);
                         free(sname);
-                        
+
                         return EOK;
                 }
-                
+
                 if ((qtype == DTYPE_AAAA) && (rr->rtype == DTYPE_AAAA) &&
                     (rr->rclass == DC_IN) && (rr->rdata_size == sizeof(addr128_t)) &&
                     (str_cmp(rr->name, sname) == 0)) {
-                
+
                         info->cname = str_dup(rr->name);
                         if (info->cname == NULL) {
@@ -164 +164 @@
                                 dns_message_destroy(amsg);
                                 free(sname);
-                                
+
                                 return ENOMEM;
                         }
-                        
+
                         addr128_t addr;
                         dns_addr128_t_decode(rr->rdata, rr->rdata_size, addr);
-                        
+
                         inet_addr_set6(addr, &info->addr);
-                        
+
                         dns_message_destroy(msg);
                         dns_message_destroy(amsg);
                         free(sname);
-                        
+
                         return EOK;
                 }
         }
-        
+
         log_msg(LOG_DEFAULT, LVL_DEBUG, "'%s' not resolved, fail", sname);
-        
+
         dns_message_destroy(msg);
         dns_message_destroy(amsg);
         free(sname);
-        
+
         return EIO;
 }
@@ -195 +195 @@
         if (info == NULL)
                 return ENOMEM;
-        
+
         errno_t rc;
-        
+
         switch (ver) {
         case ip_any:
                 rc = dns_name_query(name, DTYPE_AAAA, info);
-                
+
                 if (rc != EOK)
                         rc = dns_name_query(name, DTYPE_A, info);
-                
+
                 break;
         case ip_v4:
@@ -215 +215 @@
                 rc = EINVAL;
         }
-        
+
         if (rc == EOK)
                 *rinfo = info;
         else
                 free(info);
-        
+
         return rc;
 }