nvidia-settings-wsecurity.patch

   1 From: Andreas Beckmann <anbe@debian.org>
   2 Subject: fix -Werror=format-security errors
   3
   4 --- a/src/command-line.c
   5 +++ b/src/command-line.c
   6 @@ -59,7 +59,7 @@
   7  static void print_version(void)
   8  {
   9      nv_msg(NULL, "");
  10 -    nv_msg(NULL, pNV_ID);
  11 +    nv_msg(NULL, "%s", pNV_ID);
  12      nv_msg(TAB, "The NVIDIA X Server Settings tool.");
  13      nv_msg(NULL, "");
  14      nv_msg(TAB, "This program is used to configure the "
  15 @@ -126,7 +126,7 @@
  16                  if (entry->flags & NV_PARSER_TYPE_VALUE_IS_SWITCH_DISPLAY)
  17                      nv_msg(NULL, "  - Attribute value is switch display.");
  18
  19 -                nv_msg(TAB, entry->desc);
  20 +                nv_msg(TAB, "%s", entry->desc);
  21                  nv_msg(NULL, "");
  22              } else {
  23                  nv_msg(NULL, "%s", entry->name);
  24 @@ -146,8 +146,8 @@
  25
  26  static void print_help_helper(const char *name, const char *description)
  27  {
  28 -    nv_msg(TAB, name);
  29 -    nv_msg_preserve_whitespace(BIGTAB, description);
  30 +    nv_msg(TAB, "%s", name);
  31 +    nv_msg_preserve_whitespace(BIGTAB, "%s", description);
  32      nv_msg(NULL, "");
  33  }
  34
  35 --- a/src/glxinfo.c
  36 +++ b/src/glxinfo.c
  37 @@ -415,21 +415,21 @@
  38          /* Print results */
  39          nv_msg(TAB, "direct rendering: %s", NULL_TO_EMPTY(direct_rendering));
  40          nv_msg(TAB, "GLX extensions:");
  41 -        nv_msg("    ", NULL_TO_EMPTY(glx_extensions));
  42 +        nv_msg("    ", "%s", NULL_TO_EMPTY(glx_extensions));
  43          nv_msg(" ", "\n");
  44          nv_msg(TAB, "server glx vendor string: %s",
  45                 NULL_TO_EMPTY(server_vendor));
  46          nv_msg(TAB, "server glx version string: %s",
  47                 NULL_TO_EMPTY(server_version));
  48          nv_msg(TAB, "server glx extensions:");
  49 -        nv_msg("    ", NULL_TO_EMPTY(server_extensions));
  50 +        nv_msg("    ", "%s", NULL_TO_EMPTY(server_extensions));
  51          nv_msg(" ", "\n");
  52          nv_msg(TAB, "client glx vendor string: %s",
  53                 NULL_TO_EMPTY(client_vendor));
  54          nv_msg(TAB, "client glx version string: %s",
  55                 NULL_TO_EMPTY(client_version));
  56          nv_msg(TAB, "client glx extensions:");
  57 -        nv_msg("    ", NULL_TO_EMPTY(client_extensions));
  58 +        nv_msg("    ", "%s", NULL_TO_EMPTY(client_extensions));
  59          nv_msg(" ", "\n");
  60          nv_msg(TAB, "OpenGL vendor string: %s",
  61                 NULL_TO_EMPTY(opengl_vendor));
  62 @@ -438,7 +438,7 @@
  63          nv_msg(TAB, "OpenGL version string: %s",
  64                 NULL_TO_EMPTY(opengl_version));
  65          nv_msg(TAB, "OpenGL extensions:");
  66 -        nv_msg("    ", NULL_TO_EMPTY(opengl_extensions));
  67 +        nv_msg("    ", "%s", NULL_TO_EMPTY(opengl_extensions));
  68  #ifdef GLX_VERSION_1_3
  69          if ( fbconfig_attribs != NULL ) {
  70              nv_msg(" ", "\n");
  71 --- a/src/gtk+-2.x/ctkcolorcorrection.c
  72 +++ b/src/gtk+-2.x/ctkcolorcorrection.c
  73 @@ -1053,7 +1053,7 @@
  74      ctk_color_correction_tab_help(b, &i, title, FALSE /* randr */);
  75
  76      ctk_help_heading(b, &i, "Reset Hardware Defaults");
  77 -    ctk_help_para(b, &i, __resest_button_help);
  78 +    ctk_help_para(b, &i, "%s", __resest_button_help);
  79
  80      ctk_help_finish(b);
  81
  82 @@ -1068,7 +1068,7 @@
  83      ctk_help_heading(b, i, "Color Correction");
  84
  85      ctk_help_term(b, i, "Active Color Channel");
  86 -    ctk_help_para(b, i, __active_color_help);
  87 +    ctk_help_para(b, i, "%s", __active_color_help);
  88
  89      ctk_help_term(b, i, "Brightness, Contrast and Gamma");
  90      ctk_help_para(b, i, "The Brightness, Contrast and Gamma sliders "
  91 @@ -1087,7 +1087,7 @@
  92                    "value equally across all channels will make these games "
  93                    "appear brighter, making them more playable.");
  94
  95 -    ctk_help_para(b, i, __color_curve_help);
  96 +    ctk_help_para(b, i, "%s", __color_curve_help);
  97
  98      if (randr) {
  99          ctk_help_para(b, i, "The %s tab uses the RandR extension to "
 100 @@ -1098,5 +1098,5 @@
 101      }
 102
 103      ctk_help_term(b, i, "Confirm Current Changes");
 104 -    ctk_help_para(b, i, __confirm_button_help);
 105 +    ctk_help_para(b, i, "%s", __confirm_button_help);
 106  }
 107 --- a/src/gtk+-2.x/ctkframelock.c
 108 +++ b/src/gtk+-2.x/ctkframelock.c
 109 @@ -5963,8 +5963,8 @@
 110                    "device should behave in the frame lock group.  Setting  of "
 111                    "options is only available while frame lock is disabled.  "
 112                    "The following options are available:");
 113 -    ctk_help_para(b, &i, __server_checkbox_help);
 114 -    ctk_help_para(b, &i, __client_checkbox_help);
 115 +    ctk_help_para(b, &i, "%s", __server_checkbox_help);
 116 +    ctk_help_para(b, &i, "%s", __client_checkbox_help);
 117      ctk_help_para(b, &i, "Stereo LED: This indicates whether or not the "
 118                    "display device is synced to the stereo signal coming from "
 119                    "the Quadro Sync device.  This LED is only available to "
 120 @@ -5973,13 +5973,13 @@
 121                    "with the input timing signal.");
 122
 123      ctk_help_heading(b, &i, "Adding Devices");
 124 -    ctk_help_para(b, &i, __add_devices_button_help);
 125 +    ctk_help_para(b, &i, "%s", __add_devices_button_help);
 126      ctk_help_para(b, &i, "If the X Server is remote, be sure you have "
 127                    "configured remote access (via `xhost`, for example) "
 128                    "such that you are allowed to establish a connection.");
 129
 130      ctk_help_heading(b, &i, "Removing Devices");
 131 -    ctk_help_para(b, &i, __remove_devices_button_help);
 132 +    ctk_help_para(b, &i, "%s", __remove_devices_button_help);
 133
 134      /* House Sync Frame Help */
 135
 136 @@ -5991,17 +5991,17 @@
 137                    "device (See Display Device Information above.");
 138
 139      ctk_help_heading(b, &i, "Use House Sync on Server");
 140 -    ctk_help_para(b, &i, __use_house_sync_button_help);
 141 +    ctk_help_para(b, &i, "%s", __use_house_sync_button_help);
 142      ctk_help_para(b, &i, "If this option is checked and no house signal "
 143                    "is detected (House LED is red), the Quadro Sync device "
 144                    "will fall back to using internal timings from the primary "
 145                    "GPU.");
 146
 147      ctk_help_heading(b, &i, "Sync Interval");
 148 -    ctk_help_para(b, &i, __sync_interval_scale_help);
 149 +    ctk_help_para(b, &i, "%s", __sync_interval_scale_help);
 150
 151      ctk_help_heading(b, &i, "Sync Edge");
 152 -    ctk_help_para(b, &i, __sync_edge_combo_help);
 153 +    ctk_help_para(b, &i, "%s", __sync_edge_combo_help);
 154      ctk_help_para(b, &i, "Syncing to the rising (leading) edge should be "
 155                    "suitable for bi-level and TTL signals.  Syncing to the "
 156                    "falling edge should be used for tri-level signals.  "
 157 @@ -6010,10 +6010,10 @@
 158                    "only.");
 159
 160      ctk_help_heading(b, &i, "Video Mode");
 161 -    ctk_help_para(b, &i, __video_mode_help);
 162 +    ctk_help_para(b, &i, "%s", __video_mode_help);
 163
 164      ctk_help_heading(b, &i, "Video Mode Detect");
 165 -    ctk_help_para(b, &i, __detect_video_mode_button_help);
 166 +    ctk_help_para(b, &i, "%s", __detect_video_mode_button_help);
 167
 168      /* Button Help */
 169
 170 @@ -6026,7 +6026,7 @@
 171                    "be changed until you disable Test Link.");
 172
 173      ctk_help_heading(b, &i, "Enable Frame Lock");
 174 -    ctk_help_para(b, &i, __sync_enable_button_help);
 175 +    ctk_help_para(b, &i, "%s", __sync_enable_button_help);
 176      ctk_help_para(b, &i, "Only devices selected as clients or server will be "
 177                    "enabled.");
 178
 179 --- a/src/gtk+-2.x/ctkxvideo.c
 180 +++ b/src/gtk+-2.x/ctkxvideo.c
 181 @@ -554,7 +554,7 @@
 182
 183      if (ctk_xvideo->active_attributes & __XV_SYNC_TO_DISPLAY) {
 184          ctk_help_heading(b, &i, "Sync to this display device");
 185 -        ctk_help_para(b, &i, __xv_sync_to_display_help);
 186 +        ctk_help_para(b, &i, "%s", __xv_sync_to_display_help);
 187      }
 188
 189      ctk_help_finish(b);
 190 --- a/src/gtk+-2.x/ctkmultisample.c
 191 +++ b/src/gtk+-2.x/ctkmultisample.c
 192 @@ -1524,7 +1524,7 @@
 193          ctk_help_term(b, &i, "Application Antialiasing Settings");
 194
 195          if (ctk_multisample->active_attributes & __FSAA_ENHANCE) {
 196 -            ctk_help_para(b, &i, __aa_menu_help);
 197 +            ctk_help_para(b, &i, "%s", __aa_menu_help);
 198              ctk_help_para(b, &i, "Use Application Settings will let applications "
 199                            "choose the AA mode.");
 200              ctk_help_para(b, &i, "Override Application Settings will override "
 201 @@ -1535,7 +1535,7 @@
 202                            "antialiasing mode use the mode selected by the "
 203                            "slider.");
 204          } else {
 205 -            ctk_help_para(b, &i, __aa_override_app_help);
 206 +            ctk_help_para(b, &i, "%s", __aa_override_app_help);
 207          }
 208
 209          if (ctk_multisample->active_attributes & __FSAA_NONE) {
 210 @@ -1647,7 +1647,7 @@
 211
 212      if (ctk_multisample->active_attributes & __FXAA) {
 213          ctk_help_term(b, &i, "Enable FXAA");
 214 -        ctk_help_para(b, &i, __fxaa_enable_help);
 215 +        ctk_help_para(b, &i, "%s", __fxaa_enable_help);
 216      }
 217
 218      if (ctk_multisample->active_attributes & __LOG_ANISO_RANGE) {
 219 @@ -1669,14 +1669,14 @@
 220
 221          ctk_help_term(b, &i, "Override Application Setting");
 222
 223 -        ctk_help_para(b, &i, __aniso_override_app_help);
 224 +        ctk_help_para(b, &i, "%s", __aniso_override_app_help);
 225
 226 -        ctk_help_para(b, &i, __aniso_slider_help);
 227 +        ctk_help_para(b, &i, "%s", __aniso_slider_help);
 228      }
 229
 230      if (ctk_multisample->active_attributes & __TEXTURE_SHARPEN) {
 231          ctk_help_heading(b, &i, "Texture Sharpening");
 232 -        ctk_help_para(b, &i, __texture_sharpening_help);
 233 +        ctk_help_para(b, &i, "%s", __texture_sharpening_help);
 234      }
 235
 236      ctk_help_finish(b);
 237 --- a/src/gtk+-2.x/ctkopengl.c
 238 +++ b/src/gtk+-2.x/ctkopengl.c
 239 @@ -1206,7 +1206,7 @@
 240
 241      if (ctk_opengl->active_attributes & __SYNC_TO_VBLANK) {
 242          ctk_help_heading(b, &i, "Sync to VBlank");
 243 -        ctk_help_para(b, &i, __sync_to_vblank_help);
 244 +        ctk_help_para(b, &i, "%s", __sync_to_vblank_help);
 245      }
 246
 247      if (ctk_opengl->active_attributes & __ALLOW_FLIPPING) {
 248 @@ -1228,17 +1228,17 @@
 249
 250      if (ctk_opengl->active_attributes & __FORCE_STEREO) {
 251          ctk_help_heading(b, &i, "Force Stereo Flipping");
 252 -        ctk_help_para(b, &i, __force_stereo_help);
 253 +        ctk_help_para(b, &i, "%s", __force_stereo_help);
 254      }
 255
 256      if (ctk_opengl->active_attributes & __XINERAMA_STEREO) {
 257          ctk_help_heading(b, &i, "Allow Xinerama Stereo Flipping");
 258 -        ctk_help_para(b, &i, __xinerama_stereo_help);
 259 +        ctk_help_para(b, &i, "%s", __xinerama_stereo_help);
 260      }
 261
 262      if (ctk_opengl->active_attributes & __STEREO_EYES_EXCHANGE) {
 263          ctk_help_heading(b, &i, "Exchange Stereo Eyes");
 264 -        ctk_help_para(b, &i, __stereo_eyes_exchange_help);
 265 +        ctk_help_para(b, &i, "%s", __stereo_eyes_exchange_help);
 266      }
 267
 268      if (ctk_opengl->active_attributes & __IMAGE_SETTINGS) {
 269 @@ -1277,18 +1277,18 @@
 270      if (ctk_opengl->active_attributes & __AA_LINE_GAMMA) {
 271          ctk_help_heading(b, &i, "Enable gamma correction for "
 272                           "antialiased lines");
 273 -        ctk_help_para(b, &i, __aa_line_gamma_checkbox_help );
 274 +        ctk_help_para(b, &i, "%s", __aa_line_gamma_checkbox_help );
 275      }
 276
 277      if (ctk_opengl->active_attributes & __AA_LINE_GAMMA_VALUE) {
 278          ctk_help_heading(b, &i, "Set gamma correction for "
 279                           "antialiased lines");
 280 -        ctk_help_para(b, &i, __aa_line_gamma_slider_help);
 281 +        ctk_help_para(b, &i, "%s", __aa_line_gamma_slider_help);
 282      }
 283
 284      if (ctk_opengl->active_attributes & __CONFORMANT_CLAMPING) {
 285          ctk_help_heading(b, &i, "Use Conformant Texture Clamping");
 286 -        ctk_help_para(b, &i, __use_conformant_clamping_help);
 287 +        ctk_help_para(b, &i, "%s", __use_conformant_clamping_help);
 288      }
 289
 290      if (ctk_opengl->active_attributes & __SHOW_SLI_VISUAL_INDICATOR) {
 291 --- a/src/gtk+-2.x/ctkdisplaydevice.c
 292 +++ b/src/gtk+-2.x/ctkdisplaydevice.c
 293 @@ -507,15 +507,15 @@
 294      ctk_help_title(b, &i, "%s Help", ctk_object->name);
 295
 296      ctk_help_heading(b, &i, "Device Information");
 297 -    ctk_help_para(b, &i, __info_help);
 298 +    ctk_help_para(b, &i, "%s", __info_help);
 299
 300      for (j = 0; j < ARRAY_LEN(__info_entry_data); j++) {
 301          InfoEntryData *entryData = __info_entry_data+j;
 302          InfoEntry *entry = ctk_object->info_entries+j;
 303
 304          if (entry->present) {
 305 -            ctk_help_term(b, &i, entryData->str);
 306 -            ctk_help_para(b, &i, *entryData->tooltip);
 307 +            ctk_help_term(b, &i, "%s", entryData->str);
 308 +            ctk_help_para(b, &i, "%s", *entryData->tooltip);
 309          }
 310      }
 311
 312 --- a/src/gtk+-2.x/ctkhelp.c
 313 +++ b/src/gtk+-2.x/ctkhelp.c
 314 @@ -414,7 +414,7 @@
 315                                        gchar *text)
 316  {
 317      ctk_help_heading(b, i, "Reset Hardware Defaults");
 318 -    ctk_help_para(b, i, text);
 319 +    ctk_help_para(b, i, "%s", text);
 320  }
 321
 322
 323 @@ -463,16 +463,16 @@
 324      for (cur = help_data_list; cur; cur = cur->next) {
 325          item = (CtkHelpDataItem *)cur->data;
 326          if (use_headings) {
 327 -            ctk_help_heading(b, i, item->label);
 328 +            ctk_help_heading(b, i, "%s", item->label);
 329          } else {
 330 -            ctk_help_term(b, i, item->label);
 331 +            ctk_help_term(b, i, "%s", item->label);
 332          }
 333          g_string_printf(temp_string, "%s", item->help_text);
 334          if (item->extended_help_text) {
 335              g_string_append_printf(temp_string, " %s",
 336                                     item->extended_help_text);
 337          }
 338 -        ctk_help_para(b, i, temp_string->str);
 339 +        ctk_help_para(b, i, "%s", temp_string->str);
 340      }
 341
 342      g_string_free(temp_string, TRUE);
 343 --- a/src/gtk+-2.x/ctkglx.c
 344 +++ b/src/gtk+-2.x/ctkglx.c
 345 @@ -936,7 +936,7 @@
 346                   );
 347
 348      ctk_help_heading(b, &i, "Show GLX Frame Buffer Configurations");
 349 -    ctk_help_para(b, &i, __show_fbc_help);
 350 +    ctk_help_para(b, &i, "%s", __show_fbc_help);
 351
 352      ctk_help_heading(b, &i, "GLX Frame Buffer Configurations");
 353      ctk_help_para(b, &i, "This table lists the supported frame buffer "
 354 --- a/src/gtk+-2.x/ctkditheringcontrols.c
 355 +++ b/src/gtk+-2.x/ctkditheringcontrols.c
 356 @@ -879,16 +879,16 @@
 357      }
 358
 359      ctk_help_heading(b, i, "Dithering Controls");
 360 -    ctk_help_para(b, i, __dithering_help);
 361 +    ctk_help_para(b, i, "%s", __dithering_help);
 362
 363      ctk_help_term(b, i, "Dithering");
 364 -    ctk_help_para(b, i, __dithering_config_help);
 365 +    ctk_help_para(b, i, "%s", __dithering_config_help);
 366
 367      ctk_help_term(b, i, "Mode");
 368 -    ctk_help_para(b, i, __dithering_mode_help);
 369 +    ctk_help_para(b, i, "%s", __dithering_mode_help);
 370
 371      ctk_help_term(b, i, "Depth");
 372 -    ctk_help_para(b, i, __dithering_depth_help);
 373 +    ctk_help_para(b, i, "%s", __dithering_depth_help);
 374  } /* add_dithering_controls_help() */
 375
 376
 377 --- a/src/gtk+-2.x/ctkgvo-csc.c
 378 +++ b/src/gtk+-2.x/ctkgvo-csc.c
 379 @@ -1245,10 +1245,10 @@
 380                    "the SDI (GVO) color space conversion.");
 381
 382      ctk_help_heading(b, &i, "Override default Color Space Conversion");
 383 -    ctk_help_para(b, &i, __override_help);
 384 +    ctk_help_para(b, &i, "%s", __override_help);
 385
 386      ctk_help_heading(b, &i, "Initialize Color Space Conversion");
 387 -    ctk_help_para(b, &i, __initialize_help);
 388 +    ctk_help_para(b, &i, "%s", __initialize_help);
 389
 390      ctk_help_heading(b, &i, "Color Space Conversion Matrix, Offset and Scale");
 391      ctk_help_para(b, &i, "%s  RGB color is converted to YCrCb in the "
 392 @@ -1282,11 +1282,11 @@
 393
 394      if (ctk_gvo_csc->caps & NV_CTRL_GVO_CAPABILITIES_APPLY_CSC_IMMEDIATELY) {
 395          ctk_help_heading(b, &i, "Apply Changes Immediately");
 396 -        ctk_help_para(b, &i, __apply_immediately_help);
 397 +        ctk_help_para(b, &i, "%s", __apply_immediately_help);
 398      }
 399
 400      ctk_help_heading(b, &i, "Apply");
 401 -    ctk_help_para(b, &i, __apply_help);
 402 +    ctk_help_para(b, &i, "%s", __apply_help);
 403
 404      ctk_help_finish(b);
 405
 406 --- a/src/gtk+-2.x/ctkgvo.c
 407 +++ b/src/gtk+-2.x/ctkgvo.c
 408 @@ -783,16 +783,16 @@
 409      ctk_help_para(b, &i, "This section shows information about the SDI device "
 410                    "that is associated with the X screen.");
 411      ctk_help_heading(b, &i, "Firmware Version");
 412 -    ctk_help_para(b, &i, __general_firmware_version_help);
 413 +    ctk_help_para(b, &i, "%s", __general_firmware_version_help);
 414      ctk_help_heading(b, &i, "Current SDI Resolution");
 415 -    ctk_help_para(b, &i, __general_current_sdi_resolution_help);
 416 +    ctk_help_para(b, &i, "%s", __general_current_sdi_resolution_help);
 417      ctk_help_heading(b, &i, "Current SDI State");
 418 -    ctk_help_para(b, &i, __general_current_sdi_state_help);
 419 +    ctk_help_para(b, &i, "%s", __general_current_sdi_state_help);
 420
 421      ctk_help_heading(b, &i, "Requested SDI Video Format");
 422 -    ctk_help_para(b, &i, __requested_sdi_video_format_help);
 423 +    ctk_help_para(b, &i, "%s", __requested_sdi_video_format_help);
 424      ctk_help_heading(b, &i, "Requested SDI Data Format");
 425 -    ctk_help_para(b, &i, __requested_sdi_data_format_help);
 426 +    ctk_help_para(b, &i, "%s", __requested_sdi_data_format_help);
 427
 428      ctk_help_finish(b);
 429
 430 --- a/src/gtk+-2.x/ctkpowermizer.c
 431 +++ b/src/gtk+-2.x/ctkpowermizer.c
 432 @@ -1385,7 +1385,7 @@
 433                   conf_string);
 434      }
 435
 436 -    ctk_config_statusbar_message(ctk_powermizer->ctk_config, message);
 437 +    ctk_config_statusbar_message(ctk_powermizer->ctk_config, "%s", message);
 438  } /* post_dp_configuration_update() */
 439
 440
 441 @@ -1516,7 +1516,7 @@
 442
 443      if (ctk_powermizer->adaptive_clock_status) {
 444          ctk_help_heading(b, &i, "Adaptive Clocking");
 445 -        ctk_help_para(b, &i, __adaptive_clock_help);
 446 +        ctk_help_para(b, &i, "%s", __adaptive_clock_help);
 447      }
 448
 449      if (ctk_powermizer->gpu_clock && ctk_powermizer->memory_clock) {
 450 @@ -1528,36 +1528,36 @@
 451              s = "This indicates the GPU's current Graphics Clock and "
 452                  "Memory Clock frequencies.";
 453          }
 454 -        ctk_help_para(b, &i, s);
 455 +        ctk_help_para(b, &i, "%s", s);
 456      }
 457
 458      if (ctk_powermizer->power_source) {
 459          ctk_help_heading(b, &i, "Power Source");
 460 -        ctk_help_para(b, &i, __power_source_help);
 461 +        ctk_help_para(b, &i, "%s", __power_source_help);
 462      }
 463
 464      if (ctk_powermizer->pcie_gen_queriable) {
 465          ctk_help_heading(b, &i, "Current PCIe link width");
 466 -        ctk_help_para(b, &i, __current_pcie_link_width_help);
 467 +        ctk_help_para(b, &i, "%s", __current_pcie_link_width_help);
 468          ctk_help_heading(b, &i, "Current PCIe link speed");
 469 -        ctk_help_para(b, &i, __current_pcie_link_speed_help);
 470 +        ctk_help_para(b, &i, "%s", __current_pcie_link_speed_help);
 471      }
 472
 473      if (ctk_powermizer->performance_level) {
 474          ctk_help_heading(b, &i, "Performance Level");
 475 -        ctk_help_para(b, &i, __performance_level_help);
 476 +        ctk_help_para(b, &i, "%s", __performance_level_help);
 477          ctk_help_heading(b, &i, "Performance Levels (Table)");
 478 -        ctk_help_para(b, &i, __performance_levels_table_help);
 479 +        ctk_help_para(b, &i, "%s", __performance_levels_table_help);
 480      }
 481
 482      if (ctk_powermizer->powermizer_menu) {
 483          ctk_help_heading(b, &i, "PowerMizer Settings");
 484 -        ctk_help_para(b, &i, ctk_powermizer->powermizer_menu_help);
 485 +        ctk_help_para(b, &i, "%s", ctk_powermizer->powermizer_menu_help);
 486      }
 487
 488      if (ctk_powermizer->configuration_button) {
 489          ctk_help_heading(b, &i, "CUDA - Double precision");
 490 -        ctk_help_para(b, &i, __dp_configuration_button_help);
 491 +        ctk_help_para(b, &i, "%s", __dp_configuration_button_help);
 492      }
 493
 494      ctk_help_finish(b);
 495 --- a/src/gtk+-2.x/ctkthermal.c
 496 +++ b/src/gtk+-2.x/ctkthermal.c
 497 @@ -1623,32 +1623,32 @@
 498
 499      if (!ctk_thermal->thermal_sensor_target_type_supported) {
 500          ctk_help_heading(b, &i, "Slowdown Threshold");
 501 -        ctk_help_para(b, &i, __core_threshold_help);
 502 +        ctk_help_para(b, &i, "%s", __core_threshold_help);
 503
 504          ctk_help_heading(b, &i, "Core Temperature");
 505 -        ctk_help_para(b, &i, __core_temp_help);
 506 +        ctk_help_para(b, &i, "%s", __core_temp_help);
 507
 508          if (ctk_thermal->ambient_label) {
 509              ctk_help_heading(b, &i, "Ambient Temperature");
 510 -            ctk_help_para(b, &i, __ambient_temp_help);
 511 +            ctk_help_para(b, &i, "%s", __ambient_temp_help);
 512          }
 513      } else {
 514          ctk_help_title(b, &i, "Thermal Sensor Information Help");
 515
 516          ctk_help_heading(b, &i, "ID");
 517 -        ctk_help_para(b, &i, __thermal_sensor_id_help);
 518 +        ctk_help_para(b, &i, "%s", __thermal_sensor_id_help);
 519
 520          ctk_help_heading(b, &i, "Temperature");
 521 -        ctk_help_para(b, &i, __thermal_sensor_reading_help);
 522 +        ctk_help_para(b, &i, "%s", __thermal_sensor_reading_help);
 523
 524          ctk_help_heading(b, &i, "Target");
 525 -        ctk_help_para(b, &i, __thermal_sensor_target_help);
 526 +        ctk_help_para(b, &i, "%s", __thermal_sensor_target_help);
 527
 528          ctk_help_heading(b, &i, "Provider");
 529 -        ctk_help_para(b, &i, __thermal_sensor_provider_help);
 530 +        ctk_help_para(b, &i, "%s", __thermal_sensor_provider_help);
 531      }
 532      ctk_help_heading(b, &i, "Level");
 533 -    ctk_help_para(b, &i, __temp_level_help);
 534 +    ctk_help_para(b, &i, "%s", __temp_level_help);
 535
 536  next_help:
 537      /* if Fan not available skip online help */
 538 @@ -1659,26 +1659,26 @@
 539      ctk_help_title(b, &i, "GPU Fan Settings Help");
 540
 541      ctk_help_heading(b, &i, "ID");
 542 -    ctk_help_para(b, &i, __fan_id_help);
 543 +    ctk_help_para(b, &i, "%s", __fan_id_help);
 544
 545      ctk_help_heading(b, &i, "Speed (%%)");
 546 -    ctk_help_para(b, &i, __fan_speed_help);
 547 +    ctk_help_para(b, &i, "%s", __fan_speed_help);
 548
 549      ctk_help_heading(b, &i, "Type");
 550 -    ctk_help_para(b, &i, __fan_control_type_help);
 551 +    ctk_help_para(b, &i, "%s", __fan_control_type_help);
 552
 553      ctk_help_heading(b, &i, "Cooling Target");
 554 -    ctk_help_para(b, &i, __fan_cooling_target_help);
 555 +    ctk_help_para(b, &i, "%s", __fan_cooling_target_help);
 556
 557      ctk_help_heading(b, &i, "Enable GPU Fan Settings");
 558 -    ctk_help_para(b, &i, __enable_button_help);
 559 +    ctk_help_para(b, &i, "%s", __enable_button_help);
 560
 561      if ( ctk_thermal->show_fan_control_frame ) {
 562          ctk_help_heading(b, &i, "Enable GPU Fan Settings");
 563 -        ctk_help_para(b, &i, __apply_button_help);
 564 +        ctk_help_para(b, &i, "%s", __apply_button_help);
 565
 566          ctk_help_heading(b, &i, "Enable GPU Fan Settings");
 567 -        ctk_help_para(b, &i, __reset_button_help);
 568 +        ctk_help_para(b, &i, "%s", __reset_button_help);
 569      }
 570  done:
 571      ctk_help_finish(b);
 572 --- a/src/gtk+-2.x/ctkclocks.c
 573 +++ b/src/gtk+-2.x/ctkclocks.c
 574 @@ -599,7 +599,7 @@
 575                    "void manufacturer warranties.  DO THIS AT YOUR OWN RISK."
 576                    );
 577      ctk_help_heading(b, &i, "Enabling Clock Frequencies");
 578 -    ctk_help_para(b, &i, __enable_button_help);
 579 +    ctk_help_para(b, &i, "%s", __enable_button_help);
 580      ctk_help_para(b, &i,
 581                    "GPU Overclocking functionality is currently limited to "
 582                    "GeForce FX and newer non-mobile GPUs."
 583 @@ -614,21 +614,21 @@
 584                    "frequencies used when running 3D applications."
 585                    );
 586      ctk_help_heading(b, &i, "Graphics Clock Frequency");
 587 -    ctk_help_para(b, &i, __graphics_clock_help);
 588 +    ctk_help_para(b, &i, "%s", __graphics_clock_help);
 589      ctk_help_heading(b, &i, "Memory Clock Frequency");
 590 -    ctk_help_para(b, &i, __mem_clock_help);
 591 +    ctk_help_para(b, &i, "%s", __mem_clock_help);
 592      ctk_help_heading(b, &i, "Applying Custom Clock Frequencies");
 593 -    ctk_help_para(b, &i, __apply_button_help);
 594 +    ctk_help_para(b, &i, "%s", __apply_button_help);
 595      ctk_help_heading(b, &i, "Auto Detect Optimal 3D Clock Frequencies");
 596 -    ctk_help_para(b, &i, __detect_button_help);
 597 +    ctk_help_para(b, &i, "%s", __detect_button_help);
 598      ctk_help_heading(b, &i, "Canceling Optimal 3D Clock Frequency Auto-"
 599                       "detection.");
 600 -    ctk_help_para(b, &i, __cancel_button_help);
 601 +    ctk_help_para(b, &i, "%s", __cancel_button_help);
 602      ctk_help_para(b, &i,
 603                    "This button is only available if the Optimal "
 604                    "clocks are currently being probed.");
 605      ctk_help_heading(b, &i, "Restoring Hardware Default Frequencies");
 606 -    ctk_help_para(b, &i, __reset_button_help);
 607 +    ctk_help_para(b, &i, "%s", __reset_button_help);
 608
 609      ctk_help_finish(b);
 610
 611 @@ -887,10 +887,10 @@
 612
 613      if ( ctk_object->probing_optimal ) {
 614          ctk_config_statusbar_message(ctk_object->ctk_config,
 615 -                                     __detect_wait_msg);
 616 +                                     "%s", __detect_wait_msg);
 617      } else {
 618          ctk_config_statusbar_message(ctk_object->ctk_config,
 619 -                                     __canceled_msg);
 620 +                                     "%s", __canceled_msg);
 621      }
 622
 623  } /* auto_detection_state_received() */
 624 @@ -1380,6 +1380,6 @@
 625      if ( ret == NvCtrlSuccess &&
 626           value == NV_CTRL_GPU_OPTIMAL_CLOCK_FREQS_DETECTION_STATE_BUSY ) {
 627          ctk_config_statusbar_message(ctk_object->ctk_config,
 628 -                                     __detect_wait_msg);
 629 +                                     "%s", __detect_wait_msg);
 630      }
 631  }
 632 --- a/src/gtk+-2.x/ctkutils.c
 633 +++ b/src/gtk+-2.x/ctkutils.c
 634 @@ -316,7 +316,7 @@
 635      GtkWidget *dlg;
 636
 637      if (msg) {
 638 -        nv_error_msg(msg);
 639 +        nv_error_msg("%s", msg);
 640
 641          if (parent) {
 642              dlg = gtk_message_dialog_new
 643 @@ -344,7 +344,7 @@
 644      GtkWidget *dlg;
 645
 646      if (msg) {
 647 -        nv_warning_msg(msg);
 648 +        nv_warning_msg("%s", msg);
 649
 650          if (parent) {
 651              dlg = gtk_message_dialog_new
 652 --- a/src/gtk+-2.x/ctkdisplayconfig.c
 653 +++ b/src/gtk+-2.x/ctkdisplayconfig.c
 654 @@ -722,7 +722,7 @@
 655
 656              parent = ctk_get_parent_window(GTK_WIDGET(ctk_object));
 657              if (!parent) {
 658 -                nv_warning_msg(msg);
 659 +                nv_warning_msg("%s", msg);
 660                  g_free(msg);
 661                  break;
 662              }
 663 @@ -2195,12 +2195,12 @@
 664                    "down the CONTROL key while clicking on the display, and can "
 665                    "be moved by holding CONTROL-Click and dragging.");
 666      ctk_help_heading(b, &i, "Layout Hidden Label");
 667 -    ctk_help_para(b, &i, __layout_hidden_label_help);
 668 +    ctk_help_para(b, &i, "%s", __layout_hidden_label_help);
 669      ctk_help_heading(b, &i, "Enable Xinerama");
 670      ctk_help_para(b, &i, "%s  This setting is only available when multiple "
 671                    "X screens are present.", __layout_xinerama_button_help);
 672      ctk_help_heading(b, &i, "Selection");
 673 -    ctk_help_para(b, &i, __selected_item_help);
 674 +    ctk_help_para(b, &i, "%s", __selected_item_help);
 675
 676      ctk_help_para(b, &i, "");
 677      ctk_help_heading(b, &i, "Display Options");
 678 @@ -2208,7 +2208,7 @@
 679                    "device is selected in the Selection drop-down to configure "
 680                    "the settings for that display device.");
 681      ctk_help_heading(b, &i, "Resolution");
 682 -    ctk_help_para(b, &i, __dpy_resolution_mnu_help);
 683 +    ctk_help_para(b, &i, "%s", __dpy_resolution_mnu_help);
 684      ctk_help_heading(b, &i, "Refresh");
 685      ctk_help_para(b, &i, "The Refresh drop-down is to the right of the "
 686                    "Resolution drop-down.  %s", __dpy_refresh_mnu_help);
 687 @@ -2217,7 +2217,7 @@
 688                    "currently chosen for the selected display device.  "
 689                    "This is only available when advanced view is enabled.");
 690      ctk_help_heading(b, &i, "Stereo Eye");
 691 -    ctk_help_para(b, &i, __dpy_stereo_help);
 692 +    ctk_help_para(b, &i, "%s", __dpy_stereo_help);
 693      ctk_help_heading(b, &i, "Orientation");
 694      ctk_help_para(b, &i, "The Orientation drop-downs control how the desktop "
 695                    "image is rotated and/or reflected.  %s  %s  Note that "
 696 @@ -2229,20 +2229,20 @@
 697                    "size.  This feature is formerly known as Overscan "
 698                    "Compensation.", __dpy_underscan_text_help);
 699      ctk_help_heading(b, &i, "Position Type");
 700 -    ctk_help_para(b, &i, __dpy_position_type_help);
 701 +    ctk_help_para(b, &i, "%s", __dpy_position_type_help);
 702      ctk_help_heading(b, &i, "Position Relative");
 703 -    ctk_help_para(b, &i, __dpy_position_relative_help);
 704 +    ctk_help_para(b, &i, "%s", __dpy_position_relative_help);
 705      ctk_help_heading(b, &i, "Position Offset");
 706 -    ctk_help_para(b, &i, __dpy_position_offset_help);
 707 +    ctk_help_para(b, &i, "%s", __dpy_position_offset_help);
 708      ctk_help_heading(b, &i, "ViewPortIn");
 709 -    ctk_help_para(b, &i, __dpy_viewport_in_help);
 710 +    ctk_help_para(b, &i, "%s", __dpy_viewport_in_help);
 711      ctk_help_heading(b, &i, "ViewPortOut");
 712 -    ctk_help_para(b, &i, __dpy_viewport_out_help);
 713 +    ctk_help_para(b, &i, "%s", __dpy_viewport_out_help);
 714      ctk_help_heading(b, &i, "Panning");
 715      ctk_help_para(b, &i, "%s  This is only available when advanced "
 716                    "view is enabled.", __dpy_panning_help);
 717      ctk_help_heading(b, &i, "Primary Display");
 718 -    ctk_help_para(b, &i, __dpy_primary_help);
 719 +    ctk_help_para(b, &i, "%s", __dpy_primary_help);
 720
 721
 722      ctk_help_para(b, &i, "");
 723 @@ -2255,15 +2255,15 @@
 724                    "304x200, and the width must be a multiple of 8.",
 725                    __screen_virtual_size_help);
 726      ctk_help_heading(b, &i, "Color Depth");
 727 -    ctk_help_para(b, &i, __screen_depth_help);
 728 +    ctk_help_para(b, &i, "%s", __screen_depth_help);
 729      ctk_help_heading(b, &i, "Stereo Mode");
 730 -    ctk_help_para(b, &i, __screen_stereo_help);
 731 +    ctk_help_para(b, &i, "%s", __screen_stereo_help);
 732      ctk_help_heading(b, &i, "Position Type");
 733 -    ctk_help_para(b, &i, __screen_position_type_help);
 734 +    ctk_help_para(b, &i, "%s", __screen_position_type_help);
 735      ctk_help_heading(b, &i, "Position Relative");
 736 -    ctk_help_para(b, &i, __screen_position_relative_help);
 737 +    ctk_help_para(b, &i, "%s", __screen_position_relative_help);
 738      ctk_help_heading(b, &i, "Position Offset");
 739 -    ctk_help_para(b, &i, __screen_position_offset_help);
 740 +    ctk_help_para(b, &i, "%s", __screen_position_offset_help);
 741      ctk_help_heading(b, &i, "MetaMode Selection");
 742      ctk_help_para(b, &i, "%s  This is only available when advanced view "
 743                    "is enabled.", __screen_metamode_help);
 744 @@ -2286,16 +2286,16 @@
 745                    "screen, adding/removing an X screen, and changing the X "
 746                    "screen color depth.", __apply_button_help);
 747      ctk_help_heading(b, &i, "Detect Displays");
 748 -    ctk_help_para(b, &i, __detect_displays_button_help);
 749 +    ctk_help_para(b, &i, "%s", __detect_displays_button_help);
 750      ctk_help_heading(b, &i, "Advanced/Basic...");
 751      ctk_help_para(b, &i, "%s  The Basic view modifies the currently active "
 752                    "MetaMode for an X screen, while the advanced view exposes "
 753                    "all the MetaModes available on an X screen, and lets you "
 754                    "modify each of them.", __advanced_button_help);
 755      ctk_help_heading(b, &i, "Reset");
 756 -    ctk_help_para(b, &i, __reset_button_help);
 757 +    ctk_help_para(b, &i, "%s", __reset_button_help);
 758      ctk_help_heading(b, &i, "Save to X Configuration File");
 759 -    ctk_help_para(b, &i, __save_button_help);
 760 +    ctk_help_para(b, &i, "%s", __save_button_help);
 761
 762      ctk_help_finish(b);
 763
 764 @@ -5588,7 +5588,7 @@
 765          *updated = TRUE;
 766          if (!display_add_modelines_from_server(display, display->gpu,
 767                                                 &err_str)) {
 768 -            nv_warning_msg(err_str);
 769 +            nv_warning_msg("%s", err_str);
 770              g_free(err_str);
 771              return FALSE;
 772          }
 773 @@ -8852,7 +8852,7 @@
 774      /* Handle errors loading the new layout */
 775      if (!layout || err_str) {
 776          if (err_str) {
 777 -            nv_error_msg(err_str);
 778 +            nv_error_msg("%s", err_str);
 779              g_free(err_str);
 780          }
 781          return;
 782 --- a/src/gtk+-2.x/ctkedid.c
 783 +++ b/src/gtk+-2.x/ctkedid.c
 784 @@ -421,6 +421,6 @@
 785  void add_acquire_edid_help(GtkTextBuffer *b, GtkTextIter *i)
 786  {
 787      ctk_help_heading(b, i, "Acquire EDID");
 788 -    ctk_help_para(b, i, __acquire_edid_help);
 789 +    ctk_help_para(b, i, "%s", __acquire_edid_help);
 790
 791  } /* add_acquire_edid_help() */
 792 --- a/src/gtk+-2.x/ctkdisplayconfig-utils.c
 793 +++ b/src/gtk+-2.x/ctkdisplayconfig-utils.c
 794 @@ -1488,7 +1488,7 @@
 795                                    "device %d '%s'.",
 796                                     NvCtrlGetTargetId(display->handle),
 797                                     display->logName);
 798 -        nv_error_msg(*err_str);
 799 +        nv_error_msg("%s", *err_str);
 800          goto fail;
 801      }
 802
 803 @@ -1506,7 +1506,7 @@
 804                                         NvCtrlGetTargetId(display->handle),
 805                                         display->logName,
 806                                         str);
 807 -            nv_error_msg(*err_str);
 808 +            nv_error_msg("%s", *err_str);
 809              goto fail;
 810          }
 811
 812 @@ -2334,7 +2334,7 @@
 813      if (ret != NvCtrlSuccess) {
 814          *err_str = g_strdup_printf("Failed to query list of metamodes on\n"
 815                                     "screen %d.", screen->scrnum);
 816 -        nv_error_msg(*err_str);
 817 +        nv_error_msg("%s", *err_str);
 818          goto fail;
 819      }
 820
 821 @@ -2346,7 +2346,7 @@
 822      if (ret != NvCtrlSuccess) {
 823          *err_str = g_strdup_printf("Failed to query current metamode of\n"
 824                                     "screen %d.", screen->scrnum);
 825 -        nv_error_msg(*err_str);
 826 +        nv_error_msg("%s", *err_str);
 827          goto fail;
 828      }
 829
 830 @@ -2717,7 +2717,7 @@
 831                                     "device DPY-%d.",
 832                                     displayNameInfo->nameDescription,
 833                                     NvCtrlGetTargetId(display->handle));
 834 -        nv_error_msg(*err_str);
 835 +        nv_error_msg("%s", *err_str);
 836          return FALSE;
 837      }
 838
 839 @@ -2756,7 +2756,7 @@
 840                                     "display %d (on GPU-%d).",
 841                                     display_id,
 842                                     NvCtrlGetTargetId(gpu->handle));
 843 -        nv_error_msg(*err_str);
 844 +        nv_error_msg("%s", *err_str);
 845          goto fail;
 846      }
 847
 848 @@ -2913,7 +2913,7 @@
 849          *err_str = g_strdup_printf("Failed to query list of displays \n"
 850                                     "connected to GPU-%d '%s'.",
 851                                     NvCtrlGetTargetId(gpu->handle), gpu->name);
 852 -        nv_error_msg(*err_str);
 853 +        nv_error_msg("%s", *err_str);
 854          goto fail;
 855      }
 856
 857 @@ -3171,7 +3171,7 @@
 858      if (!gpu->handle) {
 859          *err_str = g_strdup_printf("Failed to create NV-CONTROL handle for "
 860                                     "GPU-%d.", gpu_id);
 861 -        nv_error_msg(*err_str);
 862 +        nv_error_msg("%s", *err_str);
 863          goto fail;
 864      }
 865
 866 @@ -3184,7 +3184,7 @@
 867      if (ret != NvCtrlSuccess) {
 868          *err_str = g_strdup_printf("Failed to query GPU name of GPU-%d.",
 869                                     gpu_id);
 870 -        nv_error_msg(*err_str);
 871 +        nv_error_msg("%s", *err_str);
 872          goto fail;
 873      }
 874
 875 @@ -3204,7 +3204,7 @@
 876      if (ret != NvCtrlSuccess) {
 877          *err_str = g_strdup_printf("Failed to query MAX SCREEN WIDTH on "
 878                                     "GPU-%d '%s'.", gpu_id, gpu->name);
 879 -        nv_error_msg(*err_str);
 880 +        nv_error_msg("%s", *err_str);
 881          goto fail;
 882      }
 883
 884 @@ -3213,7 +3213,7 @@
 885      if (ret != NvCtrlSuccess) {
 886          *err_str = g_strdup_printf("Failed to query MAX SCREEN HEIGHT on "
 887                                     "GPU-%d '%s'.", gpu_id, gpu->name);
 888 -        nv_error_msg(*err_str);
 889 +        nv_error_msg("%s", *err_str);
 890          goto fail;
 891      }
 892
 893 @@ -3222,7 +3222,7 @@
 894      if (ret != NvCtrlSuccess) {
 895          *err_str = g_strdup_printf("Failed to query MAX DISPLAYS on "
 896                                     "GPU-%d '%s'.", gpu_id, gpu->name);
 897 -        nv_error_msg(*err_str);
 898 +        nv_error_msg("%s", *err_str);
 899          goto fail;
 900      }
 901
 902 @@ -3351,7 +3351,7 @@
 903      if (ret != NvCtrlSuccess || !ngpus) {
 904          *err_str = g_strdup("Failed to query number of GPUs (or no GPUs "
 905                              "found) in the system.");
 906 -        nv_error_msg(*err_str);
 907 +        nv_error_msg("%s", *err_str);
 908          goto fail;
 909      }
 910
 911 @@ -3497,7 +3497,7 @@
 912          *err_str = g_strdup_printf("Failed to create NV-CONTROL handle for\n"
 913                                     "screen %d.",
 914                                     screen_id);
 915 -        nv_error_msg(*err_str);
 916 +        nv_error_msg("%s", *err_str);
 917          goto fail;
 918      }
 919
 920 @@ -3532,7 +3532,7 @@
 921          *err_str = g_strdup_printf("Failed to query Dynamic TwinView for "
 922                                     "screen %d.",
 923                                     screen_id);
 924 -        nv_warning_msg(*err_str);
 925 +        nv_warning_msg("%s", *err_str);
 926          goto fail;
 927      }
 928      screen->dynamic_twinview = !!val;
 929 @@ -3544,7 +3544,7 @@
 930          *err_str = g_strdup_printf("Failed to query NoScanout for "
 931                                     "screen %d.",
 932                                     screen_id);
 933 -        nv_warning_msg(*err_str);
 934 +        nv_warning_msg("%s", *err_str);
 935          goto fail;
 936      }
 937      screen->no_scanout = (val == NV_CTRL_NO_SCANOUT_ENABLED);
 938 @@ -3558,7 +3558,7 @@
 939                                     "support scanout screens (%d) that have "
 940                                     "dynamic twinview disabled.",
 941                                     screen_id);
 942 -        nv_warning_msg(*err_str);
 943 +        nv_warning_msg("%s", *err_str);
 944          goto fail;
 945      }
 946
 947 @@ -3566,7 +3566,7 @@
 948      if (!link_screen_to_gpus(layout, screen)) {
 949          *err_str = g_strdup_printf("Failed to find GPU that drives screen %d.",
 950                                     screen_id);
 951 -        nv_warning_msg(*err_str);
 952 +        nv_warning_msg("%s", *err_str);
 953          goto fail;
 954      }
 955
 956 @@ -3679,7 +3679,7 @@
 957      if (ret != NvCtrlSuccess || !nscreens) {
 958          *err_str = g_strdup("Failed to query number of X screens (or no X "
 959                              "screens found) in the system.");
 960 -        nv_error_msg(*err_str);
 961 +        nv_error_msg("%s", *err_str);
 962          nscreens = 0;
 963          goto fail;
 964      }
 965 @@ -3771,7 +3771,7 @@
 966                               &layout->xinerama_enabled);
 967      if (ret != NvCtrlSuccess) {
 968          *err_str = g_strdup("Failed to query status of Xinerama.");
 969 -        nv_error_msg(*err_str);
 970 +        nv_error_msg("%s", *err_str);
 971          goto fail;
 972      }
 973
 974 @@ -3784,7 +3784,7 @@
 975                                     "Display Configuration page.",
 976                                     displayName ? displayName : "this X server");
 977          free(displayName);
 978 -        nv_warning_msg(*err_str);
 979 +        nv_warning_msg("%s", *err_str);
 980          goto fail;
 981      }
 982
 983 --- a/src/gtk+-2.x/ctkgvo-sync.c
 984 +++ b/src/gtk+-2.x/ctkgvo-sync.c
 985 @@ -1502,30 +1502,30 @@
 986                    "SDI synchronization options.");
 987
 988      ctk_help_heading(b, &i, "Input Video Format");
 989 -    ctk_help_para(b, &i, __input_video_format_help);
 990 +    ctk_help_para(b, &i, "%s", __input_video_format_help);
 991      ctk_help_heading(b, &i, "Input Video Format Detect");
 992 -    ctk_help_para(b, &i, __input_video_format_detect_help);
 993 +    ctk_help_para(b, &i, "%s", __input_video_format_detect_help);
 994      ctk_help_heading(b, &i, "Composite Termination");
 995      ctk_help_para(b, &i, "%s.  This allows the composite signal to be daisy "
 996                    "chained from a server load.",
 997                    __composite_termination_help);
 998      ctk_help_heading(b, &i, "Sync Mode");
 999 -    ctk_help_para(b, &i, __sync_mode_help);
1000 +    ctk_help_para(b, &i, "%s", __sync_mode_help);
1001      ctk_help_heading(b, &i, "Sync Format");
1002 -    ctk_help_para(b, &i, __sync_format_help);
1003 +    ctk_help_para(b, &i, "%s", __sync_format_help);
1004      ctk_help_heading(b, &i, "Sync Status");
1005 -    ctk_help_para(b, &i, __sync_status_help);
1006 +    ctk_help_para(b, &i, "%s", __sync_status_help);
1007
1008      if ( ctk_gvo_sync->caps & NV_CTRL_GVO_CAPABILITIES_ADVANCE_SYNC_SKEW ) {
1009          ctk_help_heading(b, &i, "HSync Advance");
1010 -        ctk_help_para(b, &i, __hsync_advance_help);
1011 +        ctk_help_para(b, &i, "%s", __hsync_advance_help);
1012          ctk_help_heading(b, &i, "VSync Advance");
1013 -        ctk_help_para(b, &i, __vsync_advance_help);
1014 +        ctk_help_para(b, &i, "%s", __vsync_advance_help);
1015      } else {
1016          ctk_help_heading(b, &i, "HSync Delay");
1017 -        ctk_help_para(b, &i, __hsync_delay_help);
1018 +        ctk_help_para(b, &i, "%s", __hsync_delay_help);
1019          ctk_help_heading(b, &i, "VSync Delay");
1020 -        ctk_help_para(b, &i, __vsync_delay_help);
1021 +        ctk_help_para(b, &i, "%s", __vsync_delay_help);
1022      }
1023
1024      ctk_help_finish(b);
1025 --- a/src/gtk+-2.x/ctkpowersavings.c
1026 +++ b/src/gtk+-2.x/ctkpowersavings.c
1027 @@ -222,7 +222,7 @@
1028      ctk_help_title(b, &i, "Power Savings Help");
1029
1030      ctk_help_heading(b, &i, "On-Demand VBlank Interrupts");
1031 -    ctk_help_para(b, &i, __vblank_control_help);
1032 +    ctk_help_para(b, &i, "%s", __vblank_control_help);
1033
1034      ctk_help_finish(b);
1035
1036 --- a/src/gtk+-2.x/ctkappprofile.c
1037 +++ b/src/gtk+-2.x/ctkappprofile.c
1038 @@ -4072,8 +4072,8 @@
1039      ctk_help_para(b, &i, "This NVIDIA® Linux Graphics Driver supports detection of the following features:");
1040
1041      for (j = 0; j < NUM_RULE_FEATURES; j++) {
1042 -        ctk_help_term(b, &i, rule_feature_label_strings[j]);
1043 -        ctk_help_para(b, &i, rule_feature_help_text[j]);
1044 +        ctk_help_term(b, &i, "%s", rule_feature_label_strings[j]);
1045 +        ctk_help_para(b, &i, "%s", rule_feature_help_text[j]);
1046      }
1047
1048      ctk_help_heading(b, &i, "Supported Setting Keys");
1049 @@ -4082,8 +4082,8 @@
1050                           "keys. For more information on a given key, please consult the README.");
1051
1052      for (j = 0; j < NUM_PROFILE_SETTINGS; j++) {
1053 -        ctk_help_term(b, &i, profile_setting_keys[j]);
1054 -        ctk_help_para(b, &i, profile_setting_descriptions[j]);
1055 +        ctk_help_term(b, &i, "%s", profile_setting_keys[j]);
1056 +        ctk_help_para(b, &i, "%s", profile_setting_descriptions[j]);
1057      }
1058
1059      ctk_help_finish(b);
1060 --- a/src/gtk+-2.x/ctkecc.c
1061 +++ b/src/gtk+-2.x/ctkecc.c
1062 @@ -207,7 +207,7 @@
1063          snprintf(message, sizeof(message), "ECC %s.", conf_string);
1064      }
1065
1066 -    ctk_config_statusbar_message(ctk_ecc->ctk_config, message);
1067 +    ctk_config_statusbar_message(ctk_ecc->ctk_config, "%s", message);
1068  } /* post_ecc_configuration_update() */
1069
1070
1071 @@ -677,36 +677,36 @@
1072      gtk_text_buffer_get_iter_at_offset(b, &i, 0);
1073
1074      ctk_help_heading(b, &i, "ECC Settings Help");
1075 -    ctk_help_para(b, &i, __ecc_settings_help);
1076 +    ctk_help_para(b, &i, "%s", __ecc_settings_help);
1077
1078      ctk_help_heading(b, &i, "ECC");
1079 -    ctk_help_para(b, &i, __ecc_status_help);
1080 +    ctk_help_para(b, &i, "%s", __ecc_status_help);
1081
1082      if (ctk_ecc->dbit_error_available) {
1083          ctk_help_heading(b, &i, "Double-bit ECC Errors");
1084 -        ctk_help_para(b, &i, __dbit_error_help);
1085 +        ctk_help_para(b, &i, "%s", __dbit_error_help);
1086      }
1087      if (ctk_ecc->aggregate_dbit_error_available) {
1088          ctk_help_heading(b, &i, "Aggregate Double-bit ECC Errors");
1089 -        ctk_help_para(b, &i, __aggregate_dbit_error_help);
1090 +        ctk_help_para(b, &i, "%s", __aggregate_dbit_error_help);
1091      }
1092      ctk_help_heading(b, &i, "ECC Configuration");
1093 -    ctk_help_para(b, &i, __configuration_status_help);
1094 +    ctk_help_para(b, &i, "%s", __configuration_status_help);
1095
1096      ctk_help_heading(b, &i, "Enable ECC");
1097 -    ctk_help_para(b, &i, __ecc_status_help);
1098 +    ctk_help_para(b, &i, "%s", __ecc_status_help);
1099
1100      if (ctk_ecc->dbit_error_available) {
1101          ctk_help_heading(b, &i, "Clear ECC Errors");
1102 -        ctk_help_para(b, &i, __clear_button_help);
1103 +        ctk_help_para(b, &i, "%s", __clear_button_help);
1104      }
1105      if (ctk_ecc->aggregate_dbit_error_available) {
1106          ctk_help_heading(b, &i, "Clear Aggregate ECC Errors");
1107 -        ctk_help_para(b, &i, __clear_aggregate_button_help);
1108 +        ctk_help_para(b, &i, "%s", __clear_aggregate_button_help);
1109      }
1110
1111      ctk_help_heading(b, &i, "Reset Default Configuration");
1112 -    ctk_help_para(b, &i, __reset_default_config_button_help);
1113 +    ctk_help_para(b, &i, "%s", __reset_default_config_button_help);
1114
1115      ctk_help_finish(b);
1116
1117 --- a/src/gtk+-2.x/ctk3dvisionpro.c
1118 +++ b/src/gtk+-2.x/ctk3dvisionpro.c
1119 @@ -1771,7 +1771,7 @@
1120                           "with the hub.");
1121
1122      ctk_help_heading(b, &i, "Add glasses");
1123 -    ctk_help_para(b, &i, __add_glasses_tooltip);
1124 +    ctk_help_para(b, &i, "%s", __add_glasses_tooltip);
1125      ctk_help_para(b, &i, "This action is used to set up new 3D Vision Pro Glasses. "
1126                           "On clicking this button the hub enters into pairing mode. "
1127                           "Follow the instructions on Add Glasses dialog box. "
1128 @@ -1780,7 +1780,7 @@
1129                           " glasses or 'Cancel' if do not wish to store them.");
1130
1131      ctk_help_heading(b, &i, "Refresh Glasses' Information");
1132 -    ctk_help_para(b, &i, __refresh_tooltip);
1133 +    ctk_help_para(b, &i, "%s", __refresh_tooltip);
1134      ctk_help_para(b, &i, "Refresh glasses information is typically required when- \n"
1135                           "o Glasses move in and out of the range.\n"
1136                           "o Get the updated battery level of all the glasses.");
1137 @@ -1792,18 +1792,18 @@
1138                           "for a few seconds.");
1139
1140      ctk_help_heading(b, &i, "Rename glasses");
1141 -    ctk_help_para(b, &i, __rename_tooltip);
1142 +    ctk_help_para(b, &i, "%s", __rename_tooltip);
1143      ctk_help_para(b, &i, "Select the glasses from the list of paired glasses "
1144                           "that you want to rename and provide an unique new name.");
1145
1146      ctk_help_heading(b, &i, "Remove glasses");
1147 -    ctk_help_para(b, &i, __remove_glasses_tooltip);
1148 +    ctk_help_para(b, &i, "%s", __remove_glasses_tooltip);
1149      ctk_help_para(b, &i, "Select the glasses from the list of paired glasses "
1150                           "that you want to remove. On removal glasses get "
1151                           "unpaired and will not sync to the hub.");
1152
1153      ctk_help_heading(b, &i, "Glasses Information");
1154 -    ctk_help_para(b, &i, __goggle_info_tooltip);
1155 +    ctk_help_para(b, &i, "%s", __goggle_info_tooltip);
1156
1157      ctk_help_heading(b, &i, "Glasses Name");
1158      ctk_help_para(b, &i, "Each pair of glasses has an unique name and the name should "
1159 @@ -1832,7 +1832,7 @@
1160                           "\tNo Signal\t\t [0%%]");
1161
1162      ctk_help_heading(b, &i, "Hub Range");
1163 -    ctk_help_para(b, &i, __channel_range_tooltip);
1164 +    ctk_help_para(b, &i, "%s", __channel_range_tooltip);
1165      ctk_help_para(b, &i, "The hub range is the farthest distance that the "
1166                           "glasses can synchronize with the 3D Vision Pro Hub. "
1167                           "You can reduce the hub range to limit the experience "
1168 --- a/src/gtk+-2.x/ctkcolorcontrols.c
1169 +++ b/src/gtk+-2.x/ctkcolorcontrols.c
1170 @@ -523,13 +523,13 @@
1171      }
1172
1173      ctk_help_heading(b, i, "Color Controls");
1174 -    ctk_help_para(b, i, __color_controls_help);
1175 +    ctk_help_para(b, i, "%s", __color_controls_help);
1176
1177      ctk_help_term(b, i, "Color Space");
1178 -    ctk_help_para(b, i, __color_space_help);
1179 +    ctk_help_para(b, i, "%s", __color_space_help);
1180
1181      ctk_help_term(b, i, "Color Range");
1182 -    ctk_help_para(b, i, __color_range_help);
1183 +    ctk_help_para(b, i, "%s", __color_range_help);
1184  } /* add_color_controls_help() */
1185
1186
1187 --- a/src/gtk+-2.x/ctkvdpau.c
1188 +++ b/src/gtk+-2.x/ctkvdpau.c
1189 @@ -441,7 +441,7 @@
1190                      str1 = g_string_append(str1, s);
1191                  }
1192              }
1193 -            label = gtk_label_new(g_strdup_printf(str1->str));
1194 +            label = gtk_label_new(g_strdup_printf("%s", str1->str));
1195              gtk_label_set_selectable(GTK_LABEL(label), TRUE);
1196              gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.5f);
1197              gtk_table_attach(GTK_TABLE(table), label, 3, 4, count+1, count+2,
1198 @@ -769,7 +769,7 @@
1199                      str1 = g_string_append(str1, s);
1200                  }
1201              }
1202 -            label = gtk_label_new(g_strdup_printf(str1->str));
1203 +            label = gtk_label_new(g_strdup_printf("%s", str1->str));
1204              gtk_label_set_selectable(GTK_LABEL(label), TRUE);
1205              gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.5f);
1206              gtk_table_attach(GTK_TABLE(table), label, 4, 5, count+1, count+2,
1207 @@ -1494,43 +1494,43 @@
1208      gtk_text_buffer_get_iter_at_offset(b, &i, 0);
1209
1210      ctk_help_title(b, &i, "VDPAU Information Help");
1211 -    ctk_help_para(b, &i, __vdpau_information_label_help);
1212 +    ctk_help_para(b, &i, "%s", __vdpau_information_label_help);
1213
1214      ctk_help_heading(b, &i, "Base Information");
1215 -    ctk_help_para(b, &i, __base_information_help);
1216 +    ctk_help_para(b, &i, "%s", __base_information_help);
1217
1218      ctk_help_heading(b, &i, "API Version");
1219 -    ctk_help_para(b, &i, __vdpau_api_version_help);
1220 +    ctk_help_para(b, &i, "%s", __vdpau_api_version_help);
1221
1222      ctk_help_heading(b, &i, "Supported Codecs");
1223 -    ctk_help_para(b, &i, __supported_codecs_help);
1224 +    ctk_help_para(b, &i, "%s", __supported_codecs_help);
1225
1226      ctk_help_heading(b, &i, "Surface Limits");
1227 -    ctk_help_para(b, &i, __surface_limits_help);
1228 +    ctk_help_para(b, &i, "%s", __surface_limits_help);
1229
1230      ctk_help_heading(b, &i, "Video Surface");
1231 -    ctk_help_para(b, &i, __video_surface_help);
1232 +    ctk_help_para(b, &i, "%s", __video_surface_help);
1233
1234      ctk_help_heading(b, &i, "Output Surface");
1235 -    ctk_help_para(b, &i, __ouput_surface_help);
1236 +    ctk_help_para(b, &i, "%s", __ouput_surface_help);
1237
1238      ctk_help_heading(b, &i, "Bitmap Surface");
1239 -    ctk_help_para(b, &i, __bitmap_surface_help);
1240 +    ctk_help_para(b, &i, "%s", __bitmap_surface_help);
1241
1242      ctk_help_heading(b, &i, "Decoder Limits");
1243 -    ctk_help_para(b, &i, __decoder_limits_help);
1244 +    ctk_help_para(b, &i, "%s", __decoder_limits_help);
1245
1246      ctk_help_heading(b, &i, "Video Mixer");
1247 -    ctk_help_para(b, &i, __video_mixer_help);
1248 +    ctk_help_para(b, &i, "%s", __video_mixer_help);
1249
1250      ctk_help_term(b, &i, "Feature");
1251 -    ctk_help_para(b, &i, __video_mixer_feature_help);
1252 +    ctk_help_para(b, &i, "%s", __video_mixer_feature_help);
1253
1254      ctk_help_term(b, &i, "Parameter");
1255 -    ctk_help_para(b, &i, __video_mixer_parameter_help);
1256 +    ctk_help_para(b, &i, "%s", __video_mixer_parameter_help);
1257
1258      ctk_help_term(b, &i, "Attribute");
1259 -    ctk_help_para(b, &i, __video_mixer_attribute_help);
1260 +    ctk_help_para(b, &i, "%s", __video_mixer_attribute_help);
1261
1262      ctk_help_finish(b);
1263      return b;