Changeset 2d1f7a21 in mainline for uspace/srv


Ignore:
Timestamp:
2012-04-21T14:23:11Z (14 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
cb7056a
Parents:
d37d500e (diff), d3a8e47 (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:
3 edited
3 moved

Legend:

Unmodified
Added
Removed

  • uspace/srv/clipboard/Makefile

    rd37d500e r2d1f7a21  
    2929
    3030USPACE_PREFIX = ../..
    31 BINARY = clip
     31BINARY = clipboard
    3232
    3333SOURCES = \
    34         clip.c
     34        clipboard.c
    3535
    3636include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/clipboard/clipboard.c

    rd37d500e r2d1f7a21  
    3737#include <errno.h>
    3838
    39 #define NAME  "clip"
     39#define NAME  "clipboard"
    4040
    4141static char *clip_data = NULL;

  • uspace/srv/net/inet/inet.c

    rd37d500e r2d1f7a21  
    364364
    365365        if (rc != EOK) {
    366                 async_wait_for(req, NULL);
     366                async_forget(req);
    367367                return rc;
    368368        }

  • uspace/srv/net/inet/inetping.c

    rd37d500e r2d1f7a21  
    8888
    8989        if (rc != EOK) {
    90                 async_wait_for(req, NULL);
     90                async_forget(req);
    9191                return rc;
    9292        }

  • uspace/srv/vfs/vfs_ops.c

    rd37d500e r2d1f7a21  
    137137                       
    138138                        if (rc != EOK) {
    139                                 async_wait_for(msg, NULL);
     139                                async_forget(msg);
    140140                                fibril_rwlock_write_unlock(&namespace_rwlock);
    141141                                async_answer_0(rid, rc);
    … …  
    204204        if (rc != EOK) {
    205205                vfs_exchange_release(exch);
    206                 async_wait_for(msg, NULL);
     206                async_forget(msg);
    207207               
    208208                /* Mount failed, drop reference to mp_node. */
    … …  
    219219        if (rc != EOK) {
    220220                vfs_exchange_release(exch);
    221                 async_wait_for(msg, NULL);
     221                async_forget(msg);
    222222               
    223223                /* Mount failed, drop reference to mp_node. */
Note: See TracChangeset for help on using the changeset viewer.