From 0501573deda3a8dcdfcea491392f554f21ed0154 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Wed, 10 Aug 2011 16:25:56 +0200
Subject: [PATCH] Fix const correctness in the API

---
 src/hb-fallback-shape-private.hh |  2 +-
 src/hb-fallback-shape.cc         |  2 +-
 src/hb-ot-shape.cc               |  2 +-
 src/hb-ot-shape.h                |  2 +-
 src/hb-shape.cc                  | 14 +++++++-------
 src/hb-shape.h                   | 12 ++++++------
 src/hb-uniscribe-shape.cc        |  2 +-
 src/hb-uniscribe.h               |  2 +-
 8 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/hb-fallback-shape-private.hh b/src/hb-fallback-shape-private.hh
index 40e9541fd..d0beb16de 100644
--- a/src/hb-fallback-shape-private.hh
+++ b/src/hb-fallback-shape-private.hh
@@ -40,7 +40,7 @@ hb_fallback_shape (hb_font_t          *font,
 		   hb_buffer_t        *buffer,
 		   const hb_feature_t *features,
 		   unsigned int        num_features,
-		   const char         *shaper_options);
+		   const char * const *shaper_options);
 
 
 HB_END_DECLS
diff --git a/src/hb-fallback-shape.cc b/src/hb-fallback-shape.cc
index 0462400b3..2fd527f05 100644
--- a/src/hb-fallback-shape.cc
+++ b/src/hb-fallback-shape.cc
@@ -33,7 +33,7 @@ hb_fallback_shape (hb_font_t          *font,
 		   hb_buffer_t        *buffer,
 		   const hb_feature_t *features,
 		   unsigned int        num_features,
-		   const char         *shaper_options)
+		   const char * const *shaper_options)
 {
   buffer->guess_properties ();
 
diff --git a/src/hb-ot-shape.cc b/src/hb-ot-shape.cc
index fc2fa4188..4275afc82 100644
--- a/src/hb-ot-shape.cc
+++ b/src/hb-ot-shape.cc
@@ -433,7 +433,7 @@ hb_ot_shape (hb_font_t          *font,
 	     hb_buffer_t        *buffer,
 	     const hb_feature_t *features,
 	     unsigned int        num_features,
-	     const char         *shaper_options)
+	     const char * const *shaper_options)
 {
   hb_ot_shape_plan_t plan;
 
diff --git a/src/hb-ot-shape.h b/src/hb-ot-shape.h
index 0fa3f3629..1897e8458 100644
--- a/src/hb-ot-shape.h
+++ b/src/hb-ot-shape.h
@@ -39,7 +39,7 @@ hb_ot_shape (hb_font_t          *font,
 	     hb_buffer_t        *buffer,
 	     const hb_feature_t *features,
 	     unsigned int        num_features,
-	     const char         *shaper_options);
+	     const char * const *shaper_options);
 
 
 HB_END_DECLS
diff --git a/src/hb-shape.cc b/src/hb-shape.cc
index 9a4ebfe63..d42be6cbd 100644
--- a/src/hb-shape.cc
+++ b/src/hb-shape.cc
@@ -42,7 +42,7 @@ typedef hb_bool_t (*hb_shape_func_t) (hb_font_t          *font,
 				      hb_buffer_t        *buffer,
 				      const hb_feature_t *features,
 				      unsigned int        num_features,
-				      const char         *shaper_options);
+				      const char * const *shaper_options);
 
 #define HB_SHAPER_IMPLEMENT(name) {#name, hb_##name##_shape}
 static struct hb_shaper_pair_t {
@@ -110,12 +110,12 @@ hb_shape_list_shapers (void)
 }
 
 hb_bool_t
-hb_shape_full (hb_font_t           *font,
-	       hb_buffer_t         *buffer,
-	       const hb_feature_t  *features,
-	       unsigned int         num_features,
-	       const char          *shaper_options,
-	       const char         **shaper_list)
+hb_shape_full (hb_font_t          *font,
+	       hb_buffer_t        *buffer,
+	       const hb_feature_t *features,
+	       unsigned int        num_features,
+	       const char * const *shaper_options,
+	       const char * const *shaper_list)
 {
   if (likely (!shaper_list)) {
     for (unsigned int i = 0; i < ARRAY_LENGTH (shapers); i++)
diff --git a/src/hb-shape.h b/src/hb-shape.h
index 18b35aed2..685b11d4f 100644
--- a/src/hb-shape.h
+++ b/src/hb-shape.h
@@ -49,12 +49,12 @@ hb_shape (hb_font_t           *font,
 	  unsigned int         num_features);
 
 hb_bool_t
-hb_shape_full (hb_font_t           *font,
-	       hb_buffer_t         *buffer,
-	       const hb_feature_t  *features,
-	       unsigned int         num_features,
-	       const char          *shaper_options,
-	       const char         **shaper_list);
+hb_shape_full (hb_font_t          *font,
+	       hb_buffer_t        *buffer,
+	       const hb_feature_t *features,
+	       unsigned int        num_features,
+	       const char * const *shaper_options,
+	       const char * const *shaper_list);
 
 const char **
 hb_shape_list_shapers (void);
diff --git a/src/hb-uniscribe-shape.cc b/src/hb-uniscribe-shape.cc
index e583ae15e..601e01c4c 100644
--- a/src/hb-uniscribe-shape.cc
+++ b/src/hb-uniscribe-shape.cc
@@ -208,7 +208,7 @@ hb_uniscribe_shape (hb_font_t          *font,
 		    hb_buffer_t        *buffer,
 		    const hb_feature_t *features,
 		    unsigned int        num_features,
-		    const char         *shaper_options)
+		    const char * const *shaper_options)
 {
   buffer->guess_properties ();
 
diff --git a/src/hb-uniscribe.h b/src/hb-uniscribe.h
index aa893bd3d..bbb463528 100644
--- a/src/hb-uniscribe.h
+++ b/src/hb-uniscribe.h
@@ -39,7 +39,7 @@ hb_uniscribe_shape (hb_font_t          *font,
 		    hb_buffer_t        *buffer,
 		    const hb_feature_t *features,
 		    unsigned int        num_features,
-		    const char         *shaper_options);
+		    const char * const *shaper_options);
 
 
 HB_END_DECLS