summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--common/file.c4
-rw-r--r--common/os_calls.c2
-rw-r--r--libxrdp/libxrdp.c4
-rw-r--r--libxrdp/libxrdp.h2
-rw-r--r--libxrdp/xrdp_channel.c2
-rw-r--r--libxrdp/xrdp_jpeg_compress.c2
-rw-r--r--libxrdp/xrdp_mcs.c2
-rw-r--r--libxrdp/xrdp_orders.c4
-rw-r--r--rdp/rdp_orders.c2
-rw-r--r--readme.txt2
-rw-r--r--sesman/chansrv/clipboard.c6
-rw-r--r--sesman/chansrv/clipboard_file.c2
-rw-r--r--sesman/chansrv/pulse/module-xrdp-sink.c2
-rw-r--r--sesman/chansrv/pulse/module-xrdp-source.c2
-rw-r--r--sesman/sessvc/sessvc.c2
-rw-r--r--tests/gtcp_proxy/gtcp-proxy.c4
-rw-r--r--tests/tcp_proxy/main.c4
-rw-r--r--vnc/vnc.c4
-rw-r--r--xorg/X11R7.6/rdp/rdpPolyFillRect.c8
-rw-r--r--xorg/X11R7.6/rdp/rdpinput.c2
-rw-r--r--xorg/X11R7.6/rdp/rdpmain.c2
-rw-r--r--xorg/X11R7.6/rdp/rdpup.c2
-rw-r--r--xrdp/lang.c2
-rw-r--r--xrdp/xrdp.c2
-rw-r--r--xrdp/xrdp_bitmap.c2
-rw-r--r--xrdp/xrdp_mm.c2
-rw-r--r--xrdp/xrdp_wm.c4
-rw-r--r--xrdp/xrdpwin.c8
28 files changed, 43 insertions, 43 deletions
diff --git a/common/file.c b/common/file.c
index b51a37cc..9fd14c29 100644
--- a/common/file.c
+++ b/common/file.c
@@ -346,7 +346,7 @@ file_read_sections(int fd, struct list *names)
/*****************************************************************************/
/* return error */
-/* this function should be prefered over file_read_sections because it can
+/* this function should be preferred over file_read_sections because it can
read any file size */
int APP_CC
file_by_name_read_sections(const char *file_name, struct list *names)
@@ -386,7 +386,7 @@ file_read_section(int fd, const char *section,
/*****************************************************************************/
/* return error */
-/* this function should be prefered over file_read_section because it can
+/* this function should be preferred over file_read_section because it can
read any file size */
int APP_CC
file_by_name_read_section(const char *file_name, const char *section,
diff --git a/common/os_calls.c b/common/os_calls.c
index 3e3a1683..6a8bf136 100644
--- a/common/os_calls.c
+++ b/common/os_calls.c
@@ -1799,7 +1799,7 @@ g_file_read(int fd, char *ptr, int len)
}
/*****************************************************************************/
-/* write to file, returns the number of bytes writen or -1 on error */
+/* write to file, returns the number of bytes written or -1 on error */
int APP_CC
g_file_write(int fd, char *ptr, int len)
{
diff --git a/libxrdp/libxrdp.c b/libxrdp/libxrdp.c
index acc41444..834e6ae3 100644
--- a/libxrdp/libxrdp.c
+++ b/libxrdp/libxrdp.c
@@ -105,7 +105,7 @@ libxrdp_get_pdu_bytes(const char *aheader)
}
/******************************************************************************/
-/* only used durring connection */
+/* only used during connection */
struct stream * APP_CC
libxrdp_force_read(struct trans* trans)
{
@@ -1074,7 +1074,7 @@ libxrdp_query_channel(struct xrdp_session *session, int index,
}
/*****************************************************************************/
-/* returns a zero based index of the channel, -1 if error or it dosen't
+/* returns a zero based index of the channel, -1 if error or it doesn't
exist */
int EXPORT_CC
libxrdp_get_channel_id(struct xrdp_session *session, char *name)
diff --git a/libxrdp/libxrdp.h b/libxrdp/libxrdp.h
index 5f60183d..6058c9ac 100644
--- a/libxrdp/libxrdp.h
+++ b/libxrdp/libxrdp.h
@@ -281,7 +281,7 @@ struct xrdp_mppc_enc
char *outputBuffer; /* contains compressed data */
char *outputBufferPlus;
int historyOffset; /* next free slot in historyBuffer */
- int buf_len; /* length of historyBuffer, protocol dependant */
+ int buf_len; /* length of historyBuffer, protocol dependent */
int bytes_in_opb; /* compressed bytes available in outputBuffer */
int flags; /* PACKET_COMPRESSED, PACKET_AT_FRONT, PACKET_FLUSHED etc */
int flagsHold;
diff --git a/libxrdp/xrdp_channel.c b/libxrdp/xrdp_channel.c
index 7d3909d5..2da0ecdb 100644
--- a/libxrdp/xrdp_channel.c
+++ b/libxrdp/xrdp_channel.c
@@ -173,7 +173,7 @@ xrdp_channel_call_callback(struct xrdp_channel *self, struct stream *s,
/*****************************************************************************/
/* returns error */
-/* This is called from the secure layer to process an incomming non global
+/* This is called from the secure layer to process an incoming non global
channel packet.
'chanid' passed in here is the mcs channel id so it MCS_GLOBAL_CHANNEL
plus something. */
diff --git a/libxrdp/xrdp_jpeg_compress.c b/libxrdp/xrdp_jpeg_compress.c
index e4ce64fe..27c31639 100644
--- a/libxrdp/xrdp_jpeg_compress.c
+++ b/libxrdp/xrdp_jpeg_compress.c
@@ -220,7 +220,7 @@ struct mydata_comp
};
/*****************************************************************************/
-/* called at begining */
+/* called at beginning */
static void DEFAULT_CC
my_init_destination(j_compress_ptr cinfo)
{
diff --git a/libxrdp/xrdp_mcs.c b/libxrdp/xrdp_mcs.c
index 0ff57b0c..03e6bca7 100644
--- a/libxrdp/xrdp_mcs.c
+++ b/libxrdp/xrdp_mcs.c
@@ -183,7 +183,7 @@ xrdp_mcs_recv(struct xrdp_mcs *self, struct stream *s, int *chan)
}
else
{
- log_message(LOG_LEVEL_DEBUG,"Recieved an unhandled appid:%d",appid);
+ log_message(LOG_LEVEL_DEBUG,"Received an unhandled appid:%d",appid);
}
break;
diff --git a/libxrdp/xrdp_orders.c b/libxrdp/xrdp_orders.c
index 7d969514..b2f1e582 100644
--- a/libxrdp/xrdp_orders.c
+++ b/libxrdp/xrdp_orders.c
@@ -286,7 +286,7 @@ xrdp_orders_last_bounds(struct xrdp_orders *self, struct xrdp_rect *rect)
}
/*****************************************************************************/
-/* check if all coords are withing 256 bytes */
+/* check if all coords are within 256 bytes */
/* returns boolean */
static int APP_CC
xrdp_orders_send_delta(struct xrdp_orders *self, int *vals, int count)
@@ -2719,7 +2719,7 @@ xrdp_orders_out_v3(struct xrdp_orders *self, int cache_id, int cache_idx,
out_uint8(self->out_s, RDP_ORDER_BMPCACHE3); /* type */
/* cache index */
out_uint16_le(self->out_s, cache_idx);
- /* persistant cache key 1/2 */
+ /* persistent cache key 1/2 */
out_uint32_le(self->out_s, 0);
out_uint32_le(self->out_s, 0);
/* bitmap data */
diff --git a/rdp/rdp_orders.c b/rdp/rdp_orders.c
index 0e4d42ad..3372a815 100644
--- a/rdp/rdp_orders.c
+++ b/rdp/rdp_orders.c
@@ -1435,7 +1435,7 @@ rdp_orders_process_orders(struct rdp_orders *self, struct stream *s,
}
/*****************************************************************************/
-/* returns pointer, it might return bmpdata if the data dosen't need to
+/* returns pointer, it might return bmpdata if the data doesn't need to
be converted, else it mallocs it. The calling function must free
it if needed */
char *APP_CC
diff --git a/readme.txt b/readme.txt
index aa2b2742..4e4d712e 100644
--- a/readme.txt
+++ b/readme.txt
@@ -21,7 +21,7 @@ xup is a module used to connect to an rdp specific X11 server
Xserver is the files needed to build an rdp specific X11 server
COPYING is the licence file
design.txt is an attempt to expain the project design
-prog_std.txt is an attemp to explain the programming standard used
+prog_std.txt is an attempt to explain the programming standard used
since version 0.5.0 we switch to autotool to build xrdp
diff --git a/sesman/chansrv/clipboard.c b/sesman/chansrv/clipboard.c
index 310e2093..5c2a2b22 100644
--- a/sesman/chansrv/clipboard.c
+++ b/sesman/chansrv/clipboard.c
@@ -271,7 +271,7 @@ static int g_cliprdr_flags = CB_USE_LONG_FORMAT_NAMES |
CB_FILECLIP_NO_FILE_PATHS;
/* from client to server */
-/* last recieved CLIPRDR_FORMAT_LIST(CLIPRDR_FORMAT_ANNOUNCE) */
+/* last received CLIPRDR_FORMAT_LIST(CLIPRDR_FORMAT_ANNOUNCE) */
static int g_formatIds[16];
static int g_num_formatIds = 0;
@@ -1547,7 +1547,7 @@ clipboard_data_in(struct stream *s, int chan_id, int chan_flags, int length,
{
log_error("aborting clipboard_data_in - clipboard has not "
"been initialized");
- /* we return 0 here to indicate no protocol problem occured */
+ /* we return 0 here to indicate no protocol problem occurred */
return 0;
}
@@ -1887,7 +1887,7 @@ clipboard_event_selection_notify(XEvent *xevent)
XDeleteProperty(g_display, lxevent->requestor, lxevent->property);
if (type == g_incr_atom)
{
- /* nothing more to do here, the data is comming in through
+ /* nothing more to do here, the data is coming in through
PropertyNotify */
log_debug("clipboard_event_selection_notify: type is INCR "
"data_size %d property name %s type %s", data_size,
diff --git a/sesman/chansrv/clipboard_file.c b/sesman/chansrv/clipboard_file.c
index c1fb0909..e994585a 100644
--- a/sesman/chansrv/clipboard_file.c
+++ b/sesman/chansrv/clipboard_file.c
@@ -553,7 +553,7 @@ clipboard_process_file_request(struct stream *s, int clip_msg_status,
}
/*****************************************************************************/
-/* server requested info about the file and this is the responce
+/* server requested info about the file and this is the response
it's either the file size or file data */
int APP_CC
clipboard_process_file_response(struct stream *s, int clip_msg_status,
diff --git a/sesman/chansrv/pulse/module-xrdp-sink.c b/sesman/chansrv/pulse/module-xrdp-sink.c
index 8606f412..5d6256d4 100644
--- a/sesman/chansrv/pulse/module-xrdp-sink.c
+++ b/sesman/chansrv/pulse/module-xrdp-sink.c
@@ -309,7 +309,7 @@ static int data_send(struct userdata *u, pa_memchunk *chunk) {
s.sun_family = AF_UNIX;
bytes = sizeof(s.sun_path) - 1;
snprintf(s.sun_path, bytes, CHANSRV_PORT_STR, u->display_num);
- pa_log_debug("trying to conenct to %s", s.sun_path);
+ pa_log_debug("trying to connect to %s", s.sun_path);
if (connect(fd, (struct sockaddr *)&s,
sizeof(struct sockaddr_un)) != 0) {
u->failed_connect_time = pa_rtclock_now();
diff --git a/sesman/chansrv/pulse/module-xrdp-source.c b/sesman/chansrv/pulse/module-xrdp-source.c
index 37c0bb4e..52409606 100644
--- a/sesman/chansrv/pulse/module-xrdp-source.c
+++ b/sesman/chansrv/pulse/module-xrdp-source.c
@@ -313,7 +313,7 @@ static void thread_func(void *userdata) {
} else {
if (u->want_src_data)
{
- /* we dont want source data anymore */
+ /* we don't want source data anymore */
char buf[12];
buf[0] = 0;
diff --git a/sesman/sessvc/sessvc.c b/sesman/sessvc/sessvc.c
index b3e42178..ce62cb47 100644
--- a/sesman/sessvc/sessvc.c
+++ b/sesman/sessvc/sessvc.c
@@ -101,7 +101,7 @@ main(int argc, char **argv)
wm_pid = g_atoi(argv[2]);
g_writeln("xrdp-sessvc: waiting for X (pid %d) and WM (pid %d)",
x_pid, wm_pid);
- /* run xrdp-chansrv as a seperate process */
+ /* run xrdp-chansrv as a separate process */
chansrv_pid = g_fork();
if (chansrv_pid == -1)
diff --git a/tests/gtcp_proxy/gtcp-proxy.c b/tests/gtcp_proxy/gtcp-proxy.c
index 39555c76..7b6312b0 100644
--- a/tests/gtcp_proxy/gtcp-proxy.c
+++ b/tests/gtcp_proxy/gtcp-proxy.c
@@ -611,7 +611,7 @@ static gboolean on_delete_event(GtkWidget *widget, GdkEvent *ev, gpointer data)
static void on_destroy(GtkWidget *widget, gpointer data)
{
- /* this will destory all windows and return control to gtk_main() */
+ /* this will destroy all windows and return control to gtk_main() */
gtk_main_quit();
}
@@ -673,6 +673,6 @@ static void on_clear_clicked(GtkWidget *widget, gpointer data)
static void on_quit_clicked(GtkWidget *widget, gpointer data)
{
- /* this will destory all windows and return control to gtk_main() */
+ /* this will destroy all windows and return control to gtk_main() */
gtk_main_quit();
}
diff --git a/tests/tcp_proxy/main.c b/tests/tcp_proxy/main.c
index 2d283ed9..aa276c44 100644
--- a/tests/tcp_proxy/main.c
+++ b/tests/tcp_proxy/main.c
@@ -454,7 +454,7 @@ main_loop(char *local_port, char *remote_ip, char *remote_port, int hexdump)
g_writeln("bind failed");
}
- /* listen for an incomming connection */
+ /* listen for an incoming connection */
if (error == 0)
{
error = g_tcp_listen(lis_sck);
@@ -465,7 +465,7 @@ main_loop(char *local_port, char *remote_ip, char *remote_port, int hexdump)
}
}
- /* accept an incomming connection */
+ /* accept an incoming connection */
if (error == 0)
{
while ((!g_terminated) && (error == 0))
diff --git a/vnc/vnc.c b/vnc/vnc.c
index 40911e61..66b0f228 100644
--- a/vnc/vnc.c
+++ b/vnc/vnc.c
@@ -691,7 +691,7 @@ lib_framebuffer_update(struct vnc *v)
}
}
- /* keep these in 32x32, vnc cursor can be alot bigger */
+ /* keep these in 32x32, vnc cursor can be a lot bigger */
if (x > 31)
{
x = 31;
@@ -1041,7 +1041,7 @@ lib_mod_connect(struct vnc *v)
if (error == 0)
{
v->server_msg(v, "VNC tcp connected", 0);
- /* protocal version */
+ /* protocol version */
init_stream(s, 8192);
error = trans_force_read_s(v->trans, s, 12);
if (error == 0)
diff --git a/xorg/X11R7.6/rdp/rdpPolyFillRect.c b/xorg/X11R7.6/rdp/rdpPolyFillRect.c
index 7db4be69..6d37f587 100644
--- a/xorg/X11R7.6/rdp/rdpPolyFillRect.c
+++ b/xorg/X11R7.6/rdp/rdpPolyFillRect.c
@@ -188,7 +188,7 @@ rdpPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrectFill,
pGC->alu == GXnoop ||
pGC->alu == GXand ||
pGC->alu == GXcopy /*||
- pGC->alu == GXxor*/)) /* todo, why dosen't xor work? */
+ pGC->alu == GXxor*/)) /* todo, why doesn't xor work? */
{
draw_item_add_fill_region(pDirtyPriv, fill_reg, pGC->fgPixel,
pGC->alu);
@@ -210,7 +210,7 @@ rdpPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrectFill,
pGC->alu == GXnoop ||
pGC->alu == GXand ||
pGC->alu == GXcopy /*||
- pGC->alu == GXxor*/)) /* todo, why dosen't xor work? */
+ pGC->alu == GXxor*/)) /* todo, why doesn't xor work? */
{
rdpup_set_fgcolor(pGC->fgPixel);
rdpup_set_opcode(pGC->alu);
@@ -253,7 +253,7 @@ rdpPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrectFill,
pGC->alu == GXnoop ||
pGC->alu == GXand ||
pGC->alu == GXcopy /*||
- pGC->alu == GXxor*/)) /* todo, why dosen't xor work? */
+ pGC->alu == GXxor*/)) /* todo, why doesn't xor work? */
{
LLOGLN(10, ("rdpPolyFillRect: 3"));
draw_item_add_fill_region(pDirtyPriv, &clip_reg,
@@ -280,7 +280,7 @@ rdpPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrectFill,
pGC->alu == GXnoop ||
pGC->alu == GXand ||
pGC->alu == GXcopy /*||
- pGC->alu == GXxor*/)) /* todo, why dosen't xor work? */
+ pGC->alu == GXxor*/)) /* todo, why doesn't xor work? */
{
rdpup_set_fgcolor(pGC->fgPixel);
rdpup_set_opcode(pGC->alu);
diff --git a/xorg/X11R7.6/rdp/rdpinput.c b/xorg/X11R7.6/rdp/rdpinput.c
index 90788449..4801b79c 100644
--- a/xorg/X11R7.6/rdp/rdpinput.c
+++ b/xorg/X11R7.6/rdp/rdpinput.c
@@ -182,7 +182,7 @@ rdpChangeKeyboardControl(DeviceIntPtr pDev, KeybdCtrl *ctrl)
if (ctrls->enabled_ctrls & XkbRepeatKeysMask)
{
LLOGLN(10, ("rdpChangeKeyboardControl: autoRepeat on"));
- /* schedual to turn off the autorepeat after 100 ms so any app
+ /* schedule to turn off the autorepeat after 100 ms so any app
* polling it will be happy it's on */
g_kbtimer = TimerSet(g_kbtimer, 0, 100,
rdpInDeferredUpdateCallback, 0);
diff --git a/xorg/X11R7.6/rdp/rdpmain.c b/xorg/X11R7.6/rdp/rdpmain.c
index cce4e951..f173de57 100644
--- a/xorg/X11R7.6/rdp/rdpmain.c
+++ b/xorg/X11R7.6/rdp/rdpmain.c
@@ -590,7 +590,7 @@ rdpScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
/******************************************************************************/
/* this is the first function called, it can be called many times
returns the number or parameters processed
- if it dosen't apply to the rdp part, return 0 */
+ if it doesn't apply to the rdp part, return 0 */
int
ddxProcessArgument(int argc, char **argv, int i)
{
diff --git a/xorg/X11R7.6/rdp/rdpup.c b/xorg/X11R7.6/rdp/rdpup.c
index b72848d2..9c507622 100644
--- a/xorg/X11R7.6/rdp/rdpup.c
+++ b/xorg/X11R7.6/rdp/rdpup.c
@@ -1319,7 +1319,7 @@ rdpup_init(void)
g_disconnect_timeout_s = 60;
}
- rdpLog("kill disconencted [%d] timeout [%d] sec\n", g_do_kill_disconnected,
+ rdpLog("kill disconnected [%d] timeout [%d] sec\n", g_do_kill_disconnected,
g_disconnect_timeout_s);
return 1;
diff --git a/xrdp/lang.c b/xrdp/lang.c
index de81c681..fa284112 100644
--- a/xrdp/lang.c
+++ b/xrdp/lang.c
@@ -263,7 +263,7 @@ get_keymaps(int keylayout, struct xrdp_keymap *keymap)
if (g_memcmp(lkeymap, keymap, sizeof(struct xrdp_keymap)) != 0)
{
log_message(LOG_LEVEL_WARNING,
- "local keymap file for 0x%4.4x found and dosen't match "
+ "local keymap file for 0x%4.4x found and doesn't match "
"built in keymap, using local keymap file", keylayout);
}
diff --git a/xrdp/xrdp.c b/xrdp/xrdp.c
index 11577cd6..690508cb 100644
--- a/xrdp/xrdp.c
+++ b/xrdp/xrdp.c
@@ -463,7 +463,7 @@ main(int argc, char **argv)
if (g_file_exist(pid_file)) /* xrdp.pid */
{
- g_writeln("It looks like xrdp is allready running,");
+ g_writeln("It looks like xrdp is already running,");
g_writeln("if not delete the xrdp.pid file and try again");
g_deinit();
g_exit(0);
diff --git a/xrdp/xrdp_bitmap.c b/xrdp/xrdp_bitmap.c
index aafc19f2..3fd0fbb7 100644
--- a/xrdp/xrdp_bitmap.c
+++ b/xrdp/xrdp_bitmap.c
@@ -165,7 +165,7 @@ xrdp_bitmap_create_with_data(int width, int height,
if (((bpp >= 24) && (data_as_int & 3)) ||
(((bpp == 15) || (bpp == 16)) && (data_as_int & 1)))
{
- /* got to copy data here, it's not alligned
+ /* got to copy data here, it's not aligned
other calls in this file assume alignment */
Bpp = 4;
switch (bpp)
diff --git a/xrdp/xrdp_mm.c b/xrdp/xrdp_mm.c
index cfee5ee8..48a0d628 100644
--- a/xrdp/xrdp_mm.c
+++ b/xrdp/xrdp_mm.c
@@ -1983,7 +1983,7 @@ xrdp_mm_connect(struct xrdp_mm *self)
if (xrdp_mm_setup_mod2(self) == 0)
{
xrdp_wm_set_login_mode(self->wm, 10);
- rv = 0; /*sucess*/
+ rv = 0; /*success*/
}
else
{
diff --git a/xrdp/xrdp_wm.c b/xrdp/xrdp_wm.c
index d71f5020..806a2532 100644
--- a/xrdp/xrdp_wm.c
+++ b/xrdp/xrdp_wm.c
@@ -1688,7 +1688,7 @@ xrdp_wm_process_channel_data(struct xrdp_wm *self,
}
/******************************************************************************/
-/* this is the callbacks comming from libxrdp.so */
+/* this is the callbacks coming from libxrdp.so */
int DEFAULT_CC
callback(long id, int msg, long param1, long param2, long param3, long param4)
{
@@ -1760,7 +1760,7 @@ xrdp_wm_login_mode_changed(struct xrdp_wm *self)
if (self->login_mode == 0)
{
- /* this is the inital state of the login window */
+ /* this is the initial state of the login window */
xrdp_wm_set_login_mode(self, 1); /* put the wm in login mode */
list_clear(self->log);
xrdp_wm_delete_all_childs(self);
diff --git a/xrdp/xrdpwin.c b/xrdp/xrdpwin.c
index ee78273b..f3ef1074 100644
--- a/xrdp/xrdpwin.c
+++ b/xrdp/xrdpwin.c
@@ -369,7 +369,7 @@ main(int argc, char **argv)
g_exit(0);
}
- /* check if service is allready installed */
+ /* check if service is already installed */
sc_ser = OpenService(sc_man, "xrdp", SERVICE_ALL_ACCESS);
if (sc_ser == 0)
@@ -383,7 +383,7 @@ main(int argc, char **argv)
}
else
{
- g_writeln("error service is allready installed");
+ g_writeln("error service is already installed");
CloseServiceHandle(sc_ser);
CloseServiceHandle(sc_man);
g_exit(0);
@@ -405,7 +405,7 @@ main(int argc, char **argv)
g_exit(0);
}
- /* check if service is allready installed */
+ /* check if service is already installed */
sc_ser = OpenService(sc_man, "xrdp", SERVICE_ALL_ACCESS);
if (sc_ser == 0)
@@ -540,7 +540,7 @@ main(int argc, char **argv)
if (g_file_exist(pid_file)) /* xrdp.pid */
{
- g_writeln("It looks like xrdp is allready running,");
+ g_writeln("It looks like xrdp is already running,");
g_writeln("if not delete the xrdp.pid file and try again");
g_exit(0);
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-29 01:22:55 +0000