[PATCH 10/18] xquartz: fix spelling mistakes

Eric Engestrom eric at engestrom.ch
Sat Apr 2 18:53:23 UTC 2016


Signed-off-by: Eric Engestrom <eric at engestrom.ch>
---
 hw/xquartz/GL/capabilities.c     |  6 +++---
 hw/xquartz/GL/glcontextmodes.c   |  2 +-
 hw/xquartz/X11Controller.h       |  2 +-
 hw/xquartz/pbproxy/x-selection.m | 10 +++++-----
 hw/xquartz/xpr/appledri.h        |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/hw/xquartz/GL/capabilities.c b/hw/xquartz/GL/capabilities.c
index 5573629..770278a 100644
--- a/hw/xquartz/GL/capabilities.c
+++ b/hw/xquartz/GL/capabilities.c
@@ -369,7 +369,7 @@ handleDepthModes(struct glCapabilitiesConfig *c, GLint dmodes)
     assert(c->total_depth_buffer_depths < GLCAPS_DEPTH_BUFFERS);
 }
 
-/* Return non-zero if an error occured. */
+/* Return non-zero if an error occurred. */
 static CGLError
 handleRendererDescriptions(CGLRendererInfoObj info, GLint r,
                            struct glCapabilitiesConfig *c)
@@ -521,7 +521,7 @@ freeGlCapabilities(struct glCapabilities *cap)
     cap->configurations = NULL;
 }
 
-/*Return true if an error occured. */
+/*Return true if an error occurred. */
 bool
 getGlCapabilities(struct glCapabilities *cap)
 {
@@ -566,6 +566,6 @@ getGlCapabilities(struct glCapabilities *cap)
 
     CGLDestroyRendererInfo(info);
 
-    /* No error occured.  We are done. */
+    /* No error occurred.  We are done. */
     return kCGLNoError;
 }
diff --git a/hw/xquartz/GL/glcontextmodes.c b/hw/xquartz/GL/glcontextmodes.c
index 1ce3570..b1e36cb 100644
--- a/hw/xquartz/GL/glcontextmodes.c
+++ b/hw/xquartz/GL/glcontextmodes.c
@@ -409,7 +409,7 @@ _gl_get_context_mode_data(const __GLcontextModes *mode, int attribute,
  * \param count         Number of structures to allocate.
  * \param minimum_size  Minimum size of a structure to allocate.  This allows
  *                      for differences in the version of the
- *                      \c __GLcontextModes stucture used in libGL and in a
+ *                      \c __GLcontextModes structure used in libGL and in a
  *                      DRI-based driver.
  * \returns A pointer to the first element in a linked list of \c count
  *          stuctures on success, or \c NULL on failure.
diff --git a/hw/xquartz/X11Controller.h b/hw/xquartz/X11Controller.h
index 1e60270..564c4c1 100644
--- a/hw/xquartz/X11Controller.h
+++ b/hw/xquartz/X11Controller.h
@@ -88,7 +88,7 @@ typedef unsigned int NSUInteger;
     IBOutlet NSMenuItem *window_separator;
     // window_separator is DEPRECATED due to this radar:
     // <rdar://problem/7088335> NSApplication releases the separator in the Windows menu even though it's an IBOutlet
-    // It is kept around for localization compatability and is subject to removal "eventually"
+    // It is kept around for localization compatibility and is subject to removal "eventually"
     // If it is !NULL (meaning it is in the nib), it is removed from the menu and released
 
     IBOutlet NSMenuItem *x11_about_item;
diff --git a/hw/xquartz/pbproxy/x-selection.m b/hw/xquartz/pbproxy/x-selection.m
index f4f4de8..b89a576 100644
--- a/hw/xquartz/pbproxy/x-selection.m
+++ b/hw/xquartz/pbproxy/x-selection.m
@@ -787,7 +787,7 @@
     [self send_reply:&reply];
 }
 
-/* Return nil if an error occured. */
+/* Return nil if an error occurred. */
 /* DO NOT retain the encdata for longer than the length of an event response.
  * The autorelease pool will reuse/free it.
  */
@@ -818,8 +818,8 @@
     return encdata;
 }
 
-/* Return YES when an error has occured when trying to send the PICT. */
-/* The caller should send a default reponse with a property of None when an error occurs. */
+/* Return YES when an error has occurred when trying to send the PICT. */
+/* The caller should send a default response with a property of None when an error occurs. */
 - (BOOL) send_image_pict_reply:(XSelectionRequestEvent *)e
                     pasteboard:(NSPasteboard *)pb
                           type:(NSBitmapImageFileType)imagetype
@@ -866,7 +866,7 @@
     return NO; /*no error*/
 }
 
-/* Return YES if an error occured. */
+/* Return YES if an error occurred. */
 /* The caller should send a reply with a property of None when an error occurs. */
 - (BOOL) send_image_tiff_reply:(XSelectionRequestEvent *)e
                     pasteboard:(NSPasteboard *)pb
@@ -1049,7 +1049,7 @@
         if (get_property(e->requestor, e->property, &pdata, /*Delete*/ True,
                          &type)) {
             /*
-             * An error occured, so we should invoke the copy_completed:, but
+             * An error occurred, so we should invoke the copy_completed:, but
              * not handle_selection:type:propdata:
              */
             [self copy_completed:e->selection];
diff --git a/hw/xquartz/xpr/appledri.h b/hw/xquartz/xpr/appledri.h
index a96c96f..98991fc 100644
--- a/hw/xquartz/xpr/appledri.h
+++ b/hw/xquartz/xpr/appledri.h
@@ -75,7 +75,7 @@
 typedef struct {
     int type;               /* of event */
     unsigned long serial;   /* # of last request processed by server */
-    Bool send_event;        /* true if this came frome a SendEvent request */
+    Bool send_event;        /* true if this came from a SendEvent request */
     Display *display;       /* Display the event was read from */
     Window window;          /* window of event */
     Time time;              /* server timestamp when event happened */
-- 
2.8.0



More information about the xorg-devel mailing list