diff options
author | Lennart Poettering <lennart@poettering.net> | 2009-04-05 03:05:51 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2009-04-05 03:05:51 +0200 |
commit | 6ba3333030fa44fe43e3795be8af7473113f6109 (patch) | |
tree | baf9da64166d23cfe047264eb4eb3144d1014f34 /src/pulsecore/core-util.c | |
parent | 923c5bc5bfba15399649ebc50807c27765102e6e (diff) | |
parent | ca39fa2c6f9036a4c90804625842f6af38fb8008 (diff) |
Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
Diffstat (limited to 'src/pulsecore/core-util.c')
-rw-r--r-- | src/pulsecore/core-util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c index 4b093c0e..56253391 100644 --- a/src/pulsecore/core-util.c +++ b/src/pulsecore/core-util.c @@ -326,7 +326,7 @@ ssize_t pa_write(int fd, const void *buf, size_t count, int *type) { } /** Calls read() in a loop. Makes sure that as much as 'size' bytes, - * unless EOF is reached or an error occured */ + * unless EOF is reached or an error occurred */ ssize_t pa_loop_read(int fd, void*data, size_t size, int *type) { ssize_t ret = 0; int _type; @@ -1242,7 +1242,7 @@ int pa_lock_lockfile(const char *fn) { goto fail; } - /* Check wheter the file has been removed meanwhile. When yes, + /* Check whether the file has been removed meanwhile. When yes, * restart this loop, otherwise, we're done */ if (st.st_nlink >= 1) break; |