From 1770e50147080f1e7393b88cf2395820bbe1c55a Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Thu, 25 Dec 2008 14:27:20 +0000
Subject: [PATCH] Fix annoying compiler warnings

---
 panda/src/gobj/shader.cxx             | 4 ++--
 panda/src/gobj/shader.h               | 2 +-
 panda/src/gobj/vertexDataPage.cxx     | 4 ++--
 panda/src/gobj/vertexDataSaveFile.cxx | 5 ++++-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/panda/src/gobj/shader.cxx b/panda/src/gobj/shader.cxx
index 507edb17ba..bfb17acda4 100755
--- a/panda/src/gobj/shader.cxx
+++ b/panda/src/gobj/shader.cxx
@@ -1033,11 +1033,11 @@ cg_release_resources() {
 //  Description: xyz
 ////////////////////////////////////////////////////////////////////
 CGprogram Shader::
-cg_compile_entry_point(char *entry, const ShaderCaps &caps, bool fshader)
+cg_compile_entry_point(const char *entry, const ShaderCaps &caps, bool fshader)
 {
   CGprogram prog;
   CGerror err;
-  char *compiler_args[100];
+  const char *compiler_args[100];
   int nargs = 0;
   int active = fshader ? caps._active_fprofile : caps._active_vprofile;
   int ultimate = fshader ? caps._ultimate_fprofile : caps._ultimate_vprofile;
diff --git a/panda/src/gobj/shader.h b/panda/src/gobj/shader.h
index bcd2e96005..32f608dbf2 100755
--- a/panda/src/gobj/shader.h
+++ b/panda/src/gobj/shader.h
@@ -257,7 +257,7 @@ public:
  private:
   ShaderArgType cg_parameter_type(CGparameter p);
   ShaderArgDir  cg_parameter_dir(CGparameter p);
-  CGprogram     cg_compile_entry_point(char *entry, const ShaderCaps &caps, bool fshader);
+  CGprogram     cg_compile_entry_point(const char *entry, const ShaderCaps &caps, bool fshader);
   bool          cg_analyze_entry_point(CGprogram prog, bool fshader);
   bool          cg_analyze_shader(const ShaderCaps &caps);
   bool          cg_compile_shader(const ShaderCaps &caps);
diff --git a/panda/src/gobj/vertexDataPage.cxx b/panda/src/gobj/vertexDataPage.cxx
index fce892a36d..162b1ea153 100644
--- a/panda/src/gobj/vertexDataPage.cxx
+++ b/panda/src/gobj/vertexDataPage.cxx
@@ -404,7 +404,7 @@ make_resident() {
 #endif
 
     z_source.opaque = Z_NULL;
-    z_source.msg = "no error message";
+    z_source.msg = (char *) "no error message";
 
     z_source.next_in = (Bytef *)(char *)_page_data;
     z_source.avail_in = _size;
@@ -497,7 +497,7 @@ make_compressed() {
 #endif
 
     z_dest.opaque = Z_NULL;
-    z_dest.msg = "no error message";
+    z_dest.msg = (char *) "no error message";
     
     int result = deflateInit(&z_dest, vertex_data_compression_level);
     if (result < 0) {
diff --git a/panda/src/gobj/vertexDataSaveFile.cxx b/panda/src/gobj/vertexDataSaveFile.cxx
index 815341f012..a7616d091c 100644
--- a/panda/src/gobj/vertexDataSaveFile.cxx
+++ b/panda/src/gobj/vertexDataSaveFile.cxx
@@ -131,7 +131,10 @@ VertexDataSaveFile(const Filename &directory, const string &prefix,
     if (result == 0) {
       // We've got the file.  Truncate it first, for good measure, in
       // case there's an old version of the file we picked up.
-      ftruncate(_fd, 0);
+      if (ftruncate(_fd, 0) < 0) {
+        gobj_cat.warning()
+          << "Couldn't truncate vertex data save file.\n";
+      }
 
       // On Unix, it's safe to unlink (delete) the temporary file
       // after it's been opened.  The file remains open, but