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 | |
parent | 923c5bc5bfba15399649ebc50807c27765102e6e (diff) | |
parent | ca39fa2c6f9036a4c90804625842f6af38fb8008 (diff) |
Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
Diffstat (limited to 'src/pulsecore')
-rw-r--r-- | src/pulsecore/authkey.c | 2 | ||||
-rw-r--r-- | src/pulsecore/core-util.c | 4 | ||||
-rw-r--r-- | src/pulsecore/log.c | 2 | ||||
-rw-r--r-- | src/pulsecore/sink-input.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/pulsecore/authkey.c b/src/pulsecore/authkey.c index b122feee..1e31d076 100644 --- a/src/pulsecore/authkey.c +++ b/src/pulsecore/authkey.c @@ -190,7 +190,7 @@ int pa_authkey_load_auto(const char *fn, void *data, size_t length) { return pa_authkey_load(p, data, length); } -/* Store the specified cookie in the speicified cookie file */ +/* Store the specified cookie in the specified cookie file */ int pa_authkey_save(const char *fn, const void *data, size_t length) { int fd = -1; int unlock = 0, ret = -1; 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; diff --git a/src/pulsecore/log.c b/src/pulsecore/log.c index 750d73b7..60ea9c59 100644 --- a/src/pulsecore/log.c +++ b/src/pulsecore/log.c @@ -262,7 +262,7 @@ void pa_log_levelv_meta( /* We don't use dynamic memory allocation here to minimize the hit * in RT threads */ - char text[4096], location[128], timestamp[32]; + char text[16*1024], location[128], timestamp[32]; pa_assert(level < PA_LOG_LEVEL_MAX); pa_assert(format); diff --git a/src/pulsecore/sink-input.h b/src/pulsecore/sink-input.h index e7a555df..0dd5e9aa 100644 --- a/src/pulsecore/sink-input.h +++ b/src/pulsecore/sink-input.h @@ -121,7 +121,7 @@ struct pa_sink_input { * changes. Called from IO context. */ void (*update_max_rewind) (pa_sink_input *i, size_t nbytes); /* may be NULL */ - /* Called whenever the maxiumum request size of the sink + /* Called whenever the maximum request size of the sink * changes. Called from IO context. */ void (*update_max_request) (pa_sink_input *i, size_t nbytes); /* may be NULL */ |