diff options
author | Alexander Larsson <alexl@redhat.com> | 2010-05-21 10:51:03 +0200 |
---|---|---|
committer | Alexander Larsson <alexl@redhat.com> | 2010-05-21 10:51:28 +0200 |
commit | 012bd2577975b902aa5ce0cdd0eb43ef57c948fb (patch) | |
tree | 1dc3de75ad4c173d2de3f60cb0c9d78bf4517542 /client | |
parent | d351bb35ce981d39e839528f4a23bc5b501adab8 (diff) | |
download | spice-012bd2577975b902aa5ce0cdd0eb43ef57c948fb.tar.gz spice-012bd2577975b902aa5ce0cdd0eb43ef57c948fb.tar.xz spice-012bd2577975b902aa5ce0cdd0eb43ef57c948fb.zip |
Fix spelling errors in comments and strings
Diffstat (limited to 'client')
-rw-r--r-- | client/application.cpp | 6 | ||||
-rw-r--r-- | client/client_net_socket.h | 2 | ||||
-rw-r--r-- | client/cursor_channel.cpp | 2 | ||||
-rw-r--r-- | client/display_channel.cpp | 4 | ||||
-rw-r--r-- | client/glz_decode_tmpl.c | 6 | ||||
-rw-r--r-- | client/glz_decoded_image.h | 2 | ||||
-rw-r--r-- | client/glz_decoder_window.cpp | 10 | ||||
-rw-r--r-- | client/playback_channel.cpp | 2 | ||||
-rw-r--r-- | client/process_loop.cpp | 2 | ||||
-rw-r--r-- | client/red_channel.cpp | 8 | ||||
-rw-r--r-- | client/tunnel_channel.cpp | 4 | ||||
-rw-r--r-- | client/x11/main.cpp | 4 | ||||
-rw-r--r-- | client/x11/named_pipe.cpp | 2 | ||||
-rw-r--r-- | client/x11/platform.cpp | 6 | ||||
-rw-r--r-- | client/x11/red_window.cpp | 2 |
15 files changed, 31 insertions, 31 deletions
diff --git a/client/application.cpp b/client/application.cpp index 4eb8ac88..f32943e8 100644 --- a/client/application.cpp +++ b/client/application.cpp @@ -1157,7 +1157,7 @@ void Application::on_key_down(RedKey key) } if (!_sticky_info.sticky_mode) { - // during tracing (traced key was pressed and no keyboard event has occured till now) + // during tracing (traced key was pressed and no keyboard event has occurred till now) if (_sticky_info.key_first_down) { ASSERT(_sticky_info.key != REDKEY_INVALID); if (key != _sticky_info.key) { @@ -1939,8 +1939,8 @@ bool Application::process_cmd_line(int argc, char** argv) parser.add(SPICE_OPT_CA_FILE, "ca-file", "truststore file for secure connections", "ca-file", true); parser.add(SPICE_OPT_HOST_SUBJECT, "host-subject", - "subject of the host certifcate. Format: field=value pairs separated" - " by commmas. Commas and backslashes within values must be preceded by" + "subject of the host certificate. Format: field=value pairs separated" + " by commas. Commas and backslashes within values must be preceded by" " a backslash", "host-subject", true); parser.add(SPICE_OPT_PASSWORD, "password", "server password", "password", true, 'w'); parser.add(SPICE_OPT_FULL_SCREEN, "full-screen", "open in full screen mode", "auto-conf", diff --git a/client/client_net_socket.h b/client/client_net_socket.h index 35d23b0b..bc9bdd15 100644 --- a/client/client_net_socket.h +++ b/client/client_net_socket.h @@ -25,7 +25,7 @@ #include "common.h" #include "process_loop.h" -/* intterface for connenctions inside client LAN */ +/* interface for connections inside client LAN */ typedef enum { SOCKET_STATUS_OPEN, diff --git a/client/cursor_channel.cpp b/client/cursor_channel.cpp index 402d69fd..cc5d4263 100644 --- a/client/cursor_channel.cpp +++ b/client/cursor_channel.cpp @@ -486,7 +486,7 @@ void CursorChannel::create_native_cursor(CursorData* cursor) native_cursor = new UnsupportedCursor(cursor->header()); break; default: - THROW("invalid curosr type"); + THROW("invalid cursor type"); } cursor->set_opaque(native_cursor); } diff --git a/client/display_channel.cpp b/client/display_channel.cpp index bffd5399..2cdf8eaa 100644 --- a/client/display_channel.cpp +++ b/client/display_channel.cpp @@ -275,7 +275,7 @@ VideoStream::VideoStream(RedClient& client, Canvas& canvas, DisplayChannel& chan memset(_frames, 0, sizeof(_frames)); region_init(&_clip_region); if (codec_type != SPICE_VIDEO_CODEC_TYPE_MJPEG) { - THROW("invalid vide codec type %u", codec_type); + THROW("invalid video codec type %u", codec_type); } try { @@ -1398,7 +1398,7 @@ void DisplayChannel::handle_stream_destroy(RedPeer::InMessage* message) VideoStream **active_stream = &_active_streams; for (;;) { if (!*active_stream) { - THROW("not in actibe streams"); + THROW("not in active streams"); } if (*active_stream == _streams[stream_destroy->id]) { diff --git a/client/glz_decode_tmpl.c b/client/glz_decode_tmpl.c index 32ed9d45..2c475719 100644 --- a/client/glz_decode_tmpl.c +++ b/client/glz_decode_tmpl.c @@ -22,7 +22,7 @@ /* For each output pixel type the following macros are defined: OUT_PIXEL - the output pixel type - COPY_PIXEL(p, out) - assignes the pixel to the place pointed by out and + COPY_PIXEL(p, out) - assigns the pixel to the place pointed by out and increases out. Used in RLE. Need special handling because in alpha we copy only the pad byte. @@ -168,8 +168,8 @@ #define COPY_COMP_PIXEL(in, out) {out->pad = *(in++); out++;} #endif -// TODO: seperate into routines that decode to dist,len. and to a routine that -// actualy copies the data. +// TODO: separate into routines that decode to dist,len. and to a routine that +// actually copies the data. /* returns num of bytes read from in buf. size should be in PIXEL */ diff --git a/client/glz_decoded_image.h b/client/glz_decoded_image.h index ddc2d77b..6827d6dc 100644 --- a/client/glz_decoded_image.h +++ b/client/glz_decoded_image.h @@ -39,7 +39,7 @@ public: virtual ~GlzDecodedImage() {} uint8_t *get_data() {return _data;} - uint8_t *get_pixel_ref(int offset); // pallete pix_id = byte count + uint8_t *get_pixel_ref(int offset); // palette pix_id = byte count uint64_t get_id() {return _id;} uint64_t get_window_head_id() {return _win_head_id;} int get_size() {return _size;} diff --git a/client/glz_decoder_window.cpp b/client/glz_decoder_window.cpp index 2cdad589..24dfce3e 100644 --- a/client/glz_decoder_window.cpp +++ b/client/glz_decoder_window.cpp @@ -68,14 +68,14 @@ void GlzDecoderWindow::post_decode(GlzDecodedImage *image) /* index: the physical index in the images array. Note that it can't change between waits since the realloc mutex should be read locked. - No starvation for the realloc mutex can occure, since the image we wait for is located before us, + No starvation for the realloc mutex can occur, since the image we wait for is located before us, hence, when it arrives - no realloc is needed. */ void GlzDecoderWindow::wait_for_image(int index) { Lock lock(_new_image_mutex); GlzDecodedImage *image = _images[index]; // can be performed without locking the _win_mutex, - // since it is called after pre and the rw mutex is // locked, hence, physical chnages to the window are - // not allowed. In addtion the reading of the image ptr + // since it is called after pre and the rw mutex is // locked, hence, physical changes to the window are + // not allowed. In addition the reading of the image ptr // is atomic, thus, even if the value changes we are // not affected. @@ -146,7 +146,7 @@ inline bool GlzDecoderWindow::is_empty() return (!_n_images); } -/* aprroximated overflow. Considers only the size that currently occupies the window and +/* approximated overflow. Considers only the size that currently occupies the window and not the size of the missing images. TODO: consider other measures */ inline bool GlzDecoderWindow::will_overflow(uint64_t image_id, uint64_t relative_head_id) { @@ -302,7 +302,7 @@ void GlzDecoderWindow::narrow_window(GlzDecodedImage *last_added) _missing_list.pop_front(); // removing the last added image from the missing list - /* maintaing the missing list: removing front images that already arrived */ + /* maintaining the missing list: removing front images that already arrived */ while (!_missing_list.empty()) { int front_win_idx = calc_image_win_idx(_missing_list.front()); if (_images[front_win_idx] == NULL) { // still missing diff --git a/client/playback_channel.cpp b/client/playback_channel.cpp index b943b34a..e1aa0653 100644 --- a/client/playback_channel.cpp +++ b/client/playback_channel.cpp @@ -262,7 +262,7 @@ void PlaybackChannel::handle_start(RedPeer::InMessage* message) start->channels); } catch (...) { LOG_WARN("create player failed"); - //todo: support disconnecting singel channel + //todo: support disconnecting single channel disable(); return; } diff --git a/client/process_loop.cpp b/client/process_loop.cpp index d8c63347..5337c36a 100644 --- a/client/process_loop.cpp +++ b/client/process_loop.cpp @@ -36,7 +36,7 @@ void SyncEvent::response(AbstractProcessLoop& events_loop) try { do_response(events_loop); } catch (Exception& e) { - LOG_WARN("unhandle exception: %s", e.what()); + LOG_WARN("unhandled exception: %s", e.what()); _err = true; } catch (...) { _err = true; diff --git a/client/red_channel.cpp b/client/red_channel.cpp index c4c719a3..6e6190f6 100644 --- a/client/red_channel.cpp +++ b/client/red_channel.cpp @@ -273,9 +273,9 @@ void* RedChannel::worker_main(void *data) Platform::set_thread_priority(NULL, channel->get_worker_priority()); channel->run(); } catch (Exception& e) { - LOG_ERROR("unhandle exception: %s", e.what()); + LOG_ERROR("unhandled exception: %s", e.what()); } catch (std::exception& e) { - LOG_ERROR("unhandle exception: %s", e.what()); + LOG_ERROR("unhandled exception: %s", e.what()); } catch (...) { LOG_ERROR("unhandled exception"); } @@ -676,12 +676,12 @@ void RedChannel::handle_notify(RedPeer::InMessage* message) if (notify->severty > SPICE_NOTIFY_SEVERITY_ERROR) { - THROW("bad sevirity"); + THROW("bad severity"); } sevirity = sevirity_strings[notify->severty]; if (notify->visibilty > SPICE_NOTIFY_VISIBILITY_HIGH) { - THROW("bad visibilty"); + THROW("bad visibility"); } visibility = visibility_strings[notify->visibilty]; diff --git a/client/tunnel_channel.cpp b/client/tunnel_channel.cpp index 52235501..1b7d7cb4 100644 --- a/client/tunnel_channel.cpp +++ b/client/tunnel_channel.cpp @@ -409,7 +409,7 @@ void TunnelChannel::handle_socket_close(RedPeer::InMessage* message) if (sckt->is_connected()) { sckt->push_disconnect(); } else { - // close happend in the server side before it received the client + // close happened in the server side before it received the client // close msg. we should ack the server and free the socket on_socket_disconnect(*sckt); } @@ -502,7 +502,7 @@ void TunnelChannel::on_socket_disconnect(ClientNetSocket& sckt) { TunnelChannel::TunnelSocket* tunnel_sckt = static_cast<TunnelChannel::TunnelSocket*>(&sckt); Message* out_msg; - // close intiated by server -> needs ack + // close initiated by server -> needs ack if (tunnel_sckt->get_guest_closed()) { DBG(0, "send close ack connection_id=%d", tunnel_sckt->id()); out_msg = new Message(SPICE_MSGC_TUNNEL_SOCKET_CLOSED_ACK, sizeof(SpiceMsgcTunnelSocketClosedAck)); diff --git a/client/x11/main.cpp b/client/x11/main.cpp index 3ee64285..1b9bb893 100644 --- a/client/x11/main.cpp +++ b/client/x11/main.cpp @@ -35,10 +35,10 @@ int main(int argc, char** argv) exit_val = Application::main(argc, argv, version_str); LOG_INFO("Spice client terminated (exitcode = %d)", exit_val); } catch (Exception& e) { - LOG_ERROR("unhandle exception: %s", e.what()); + LOG_ERROR("unhandled exception: %s", e.what()); exit_val = e.get_error_code(); } catch (std::exception& e) { - LOG_ERROR("unhandle exception: %s", e.what()); + LOG_ERROR("unhandled exception: %s", e.what()); exit_val = SPICEC_ERROR_CODE_ERROR; } catch (...) { LOG_ERROR("unhandled exception"); diff --git a/client/x11/named_pipe.cpp b/client/x11/named_pipe.cpp index 3043ba23..c6f38daa 100644 --- a/client/x11/named_pipe.cpp +++ b/client/x11/named_pipe.cpp @@ -75,7 +75,7 @@ int32_t Session::read(uint8_t *buf, int32_t size) int now; if ((now = recv(_fd_client, (char *)pos, size, 0)) <= 0) { if (now == 0) { - DBG(0, "read error, connetion shutdown"); + DBG(0, "read error, connection shutdown"); return -1; } if (errno == EAGAIN) { diff --git a/client/x11/platform.cpp b/client/x11/platform.cpp index ea492edb..fecfb138 100644 --- a/client/x11/platform.cpp +++ b/client/x11/platform.cpp @@ -337,7 +337,7 @@ XIC XPlatform::get_input_context() void XPlatform::set_win_proc(Window win, win_proc_t proc) { if (XSaveContext(x_display, win, win_proc_context, (XPointer)proc)) { - THROW("set win proc pailed"); + THROW("set win proc failed"); } } @@ -775,7 +775,7 @@ bool DynamicScreen::set_screen_size(int size_index) XRRScreenConfiguration* config; if (!(config = XRRGetScreenInfo(get_display(), root_window))) { - LOG_WARN("get scren info failed"); + LOG_WARN("get screen info failed"); return false; } Rotation rotation; @@ -2592,7 +2592,7 @@ XLocalCursor::XLocalCursor(CursorData* cursor_data) int size; if (!get_size_bits(header, size)) { - THROW("invalid curosr type"); + THROW("invalid cursor type"); } uint32_t* cur_data = new uint32_t[cur_size]; diff --git a/client/x11/red_window.cpp b/client/x11/red_window.cpp index c9a16ec1..7e69b428 100644 --- a/client/x11/red_window.cpp +++ b/client/x11/red_window.cpp @@ -1875,7 +1875,7 @@ bool RedWindow::get_mouse_anchor_point(SpicePoint& pt) while (!(vis_region = get_visibale_region(_win))) { if (!vis_region_retries) { - THROW("get visibale region failed"); + THROW("get visible region failed"); } --vis_region_retries; usleep(X_RETRY_DELAY_MICRO); |