Changeset 3ce5162 in mainline for uspace/srv

Timestamp:

2012-01-25T18:03:38Z (14 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

5c5f522

Parents:

ed6fdc7 (diff), 5cc9eba (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline

Location:

uspace/srv

Files:

• loc/loc.c (modified) (1 diff)
• net/net/net.h (modified) (1 diff)
• net/nil/nildummy/nildummy.c (modified) (2 diffs)

uspace/srv/loc/loc.c

@@ -813 +813 @@
  * On success, answer will contain EOK int retval.
  * On failure, error code will be sent in retval.
+ *
  */
 static void loc_callback_create(ipc_callid_t iid, ipc_call_t *icall)
 {
-        cb_sess_t *cb_sess;
-        
-        cb_sess = calloc(1, sizeof(cb_sess_t));
+        cb_sess_t *cb_sess = calloc(1, sizeof(cb_sess_t));
         if (cb_sess == NULL) {
                 async_answer_0(iid, ENOMEM);

uspace/srv/net/net/net.h

@@ -96 +96 @@
         
         /** Serving network interface driver module index. */
-        service_id_t sid;  /**< Service ID */
-        async_sess_t *sess;      /**< Driver session. */
+        service_id_t sid;    /**< Service ID */
+        async_sess_t *sess;  /**< Driver session. */
         
         module_t *nil;  /**< Serving link layer module index. */

uspace/srv/net/nil/nildummy/nildummy.c

@@ -360 +360 @@
     services_t sender)
 {
-        packet_t *p;
-        
         fibril_rwlock_read_lock(&nildummy_globals.devices_lock);
         
@@ -371 +369 @@
         }
         
-        p = packet;
+        packet_t *p = packet;
         do {
                 nic_send_frame(device->sess, packet_get_data(p),