ext/exif: make php_tiff_bytes_per_format and other globals const

Author: MaxKellermann

ext/exif/exif.c

@@ -230,10 +230,10 @@ static size_t php_strnlen(char* str, size_t maxlen) {
 /* }}} */
 
 /* {{{ error messages */
-static const char * EXIF_ERROR_FILEEOF   = "Unexpected end of file reached";
-static const char * EXIF_ERROR_CORRUPT   = "File structure corrupted";
-static const char * EXIF_ERROR_THUMBEOF  = "Thumbnail goes IFD boundary or end of file reached";
-static const char * EXIF_ERROR_FSREALLOC = "Illegal reallocating of undefined file section";
+static const char *const EXIF_ERROR_FILEEOF   = "Unexpected end of file reached";
+static const char *const EXIF_ERROR_CORRUPT   = "File structure corrupted";
+static const char *const EXIF_ERROR_THUMBEOF  = "Thumbnail goes IFD boundary or end of file reached";
+static const char *const EXIF_ERROR_FSREALLOC = "Illegal reallocating of undefined file section";
 
 #define EXIF_ERRLOG_FILEEOF(ImageInfo)    exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_WARNING, "%s", EXIF_ERROR_FILEEOF);
 #define EXIF_ERRLOG_CORRUPT(ImageInfo)    exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_WARNING, "%s", EXIF_ERROR_CORRUPT);
@@ -244,7 +244,7 @@ static const char * EXIF_ERROR_FSREALLOC = "Illegal reallocating of undefined fi
 /* {{{ format description defines
    Describes format descriptor
 */
-static int php_tiff_bytes_per_format[] = {0, 1, 1, 2, 4, 8, 1, 1, 2, 4, 8, 4, 8, 1};
+static const int php_tiff_bytes_per_format[] = {0, 1, 1, 2, 4, 8, 1, 1, 2, 4, 8, 4, 8, 1};
 #define NUM_FORMATS 13
 
 #define TAG_FMT_BYTE       1
@@ -504,15 +504,15 @@ typedef const struct {
 	char *Desc;
 } tag_info_type;
 
-typedef tag_info_type  tag_info_array[];
-typedef tag_info_type  *tag_table_type;
+typedef const tag_info_type  tag_info_array[];
+typedef const tag_info_type  *tag_table_type;
 
 #define TAG_TABLE_END \
   {TAG_NONE,           "No tag value"},\
   {TAG_COMPUTED_VALUE, "Computed value"},\
   {TAG_END_OF_LIST,    ""}  /* Important for exif_get_tagname() IF value != "" function result is != false */
 
-static tag_info_array tag_table_IFD = {
+static const tag_info_array tag_table_IFD = {
   { 0x000B, "ACDComment"},
   { 0x00FE, "NewSubFile"}, /* better name it 'ImageType' ? */
   { 0x00FF, "SubFile"},
@@ -760,7 +760,7 @@ static tag_info_array tag_table_IFD = {
   TAG_TABLE_END
 } ;
 
-static tag_info_array tag_table_GPS = {
+static const tag_info_array tag_table_GPS = {
   { 0x0000, "GPSVersion"},
   { 0x0001, "GPSLatitudeRef"},
   { 0x0002, "GPSLatitude"},
@@ -795,7 +795,7 @@ static tag_info_array tag_table_GPS = {
   TAG_TABLE_END
 };
 
-static tag_info_array tag_table_IOP = {
+static const tag_info_array tag_table_IOP = {
   { 0x0001, "InterOperabilityIndex"}, /* should be 'R98' or 'THM' */
   { 0x0002, "InterOperabilityVersion"},
   { 0x1000, "RelatedFileFormat"},
@@ -804,7 +804,7 @@ static tag_info_array tag_table_IOP = {
   TAG_TABLE_END
 };
 
-static tag_info_array tag_table_VND_CANON = {
+static const tag_info_array tag_table_VND_CANON = {
   { 0x0001, "ModeArray"}, /* guess */
   { 0x0004, "ImageInfo"}, /* guess */
   { 0x0006, "ImageType"},
@@ -816,7 +816,7 @@ static tag_info_array tag_table_VND_CANON = {
   TAG_TABLE_END
 };
 
-static tag_info_array tag_table_VND_CASIO = {
+static const tag_info_array tag_table_VND_CASIO = {
   { 0x0001, "RecordingMode"},
   { 0x0002, "Quality"},
   { 0x0003, "FocusingMode"},
@@ -832,7 +832,7 @@ static tag_info_array tag_table_VND_CASIO = {
   TAG_TABLE_END
 };
 
-static tag_info_array tag_table_VND_FUJI = {
+static const tag_info_array tag_table_VND_FUJI = {
   { 0x0000, "Version"},
   { 0x1000, "Quality"},
   { 0x1001, "Sharpness"},
@@ -852,7 +852,7 @@ static tag_info_array tag_table_VND_FUJI = {
   TAG_TABLE_END
 };
 
-static tag_info_array tag_table_VND_NIKON = {
+static const tag_info_array tag_table_VND_NIKON = {
   { 0x0003, "Quality"},
   { 0x0004, "ColorMode"},
   { 0x0005, "ImageAdjustment"},
@@ -864,7 +864,7 @@ static tag_info_array tag_table_VND_NIKON = {
   TAG_TABLE_END
 };
 
-static tag_info_array tag_table_VND_NIKON_990 = {
+static const tag_info_array tag_table_VND_NIKON_990 = {
   { 0x0001, "Version"},
   { 0x0002, "ISOSetting"},
   { 0x0003, "ColorMode"},
@@ -883,7 +883,7 @@ static tag_info_array tag_table_VND_NIKON_990 = {
   TAG_TABLE_END
 };
 
-static tag_info_array tag_table_VND_OLYMPUS = {
+static const tag_info_array tag_table_VND_OLYMPUS = {
   { 0x0200, "SpecialMode"},
   { 0x0201, "JPEGQuality"},
   { 0x0202, "Macro"},
@@ -895,7 +895,7 @@ static tag_info_array tag_table_VND_OLYMPUS = {
   TAG_TABLE_END
 };
 
-static tag_info_array tag_table_VND_SAMSUNG = {
+static const tag_info_array tag_table_VND_SAMSUNG = {
   { 0x0001, "Version"},
   { 0x0021, "PictureWizard"},
   { 0x0030, "LocalLocationName"},
@@ -929,7 +929,7 @@ static tag_info_array tag_table_VND_SAMSUNG = {
   TAG_TABLE_END
 };
 
-static tag_info_array tag_table_VND_PANASONIC = {
+static const tag_info_array tag_table_VND_PANASONIC = {
   { 0x0001, "Quality"},
   { 0x0002, "FirmwareVersion"},
   { 0x0003, "WhiteBalance"},
@@ -1030,7 +1030,7 @@ static tag_info_array tag_table_VND_PANASONIC = {
   TAG_TABLE_END
 };
 
-static tag_info_array tag_table_VND_DJI = {
+static const tag_info_array tag_table_VND_DJI = {
   { 0x0001, "Make"},
   { 0x0003, "SpeedX"},
   { 0x0004, "SpeedY"},
@@ -1044,7 +1044,7 @@ static tag_info_array tag_table_VND_DJI = {
   TAG_TABLE_END
 };
 
-static tag_info_array tag_table_VND_SONY = {
+static const tag_info_array tag_table_VND_SONY = {
   { 0x0102, "Quality"},
   { 0x0104, "FlashExposureComp"},
   { 0x0105, "Teleconverter"},
@@ -1099,7 +1099,7 @@ static tag_info_array tag_table_VND_SONY = {
   TAG_TABLE_END
 };
 
-static tag_info_array tag_table_VND_PENTAX = {
+static const tag_info_array tag_table_VND_PENTAX = {
   { 0x0000, "Version"},
   { 0x0001, "Mode"},
   { 0x0002, "PreviewResolution"},
@@ -1184,7 +1184,7 @@ static tag_info_array tag_table_VND_PENTAX = {
   TAG_TABLE_END
 };
 
-static tag_info_array tag_table_VND_MINOLTA = {
+static const tag_info_array tag_table_VND_MINOLTA = {
   { 0x0000, "Version"},
   { 0x0001, "CameraSettingsStdOld"},
   { 0x0003, "CameraSettingsStdNew"},
@@ -1215,7 +1215,7 @@ static tag_info_array tag_table_VND_MINOLTA = {
   TAG_TABLE_END
 };
 
-static tag_info_array tag_table_VND_SIGMA = {
+static const tag_info_array tag_table_VND_SIGMA = {
   { 0x0002, "SerialNumber"},
   { 0x0003, "DriveMode"},
   { 0x0004, "ResolutionMode"},
@@ -1242,13 +1242,13 @@ static tag_info_array tag_table_VND_SIGMA = {
   TAG_TABLE_END
 };
 
-static tag_info_array tag_table_VND_KYOCERA = {
+static const tag_info_array tag_table_VND_KYOCERA = {
   { 0x0001, "FormatThumbnail"},
   { 0x0E00, "PrintImageMatchingInfo"},
   TAG_TABLE_END
 };
 
-static tag_info_array tag_table_VND_RICOH = {
+static const tag_info_array tag_table_VND_RICOH = {
   { 0x0001, "MakerNoteDataType"},
   { 0x0002, "Version"},
   { 0x0E00, "PrintImageMatchingInfo"},