Merge pull request #20 from jspricke/fix_compile

Fix compilation on Ubuntu 16.04 (ROS kinetic sbuild) - by Jochen Sprickerhof
AndreaCensi · Jan 15, 2017 · 1371eb4 · 1371eb4
2 parents 80f15ff + cffc6be
commit 1371eb4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/package.xml b/package.xml
@@ -22,8 +22,7 @@
   <url type="bugtracker">https://github.com/AndreaCensi/csm/issues</url>
   <maintainer email="130s@2000.jukuin.keio.ac.jp">Isaac I.Y. Saito</maintainer>
 
-  <buildtool_depend>cmake</buildtool_depend>
-  <run_depend>catkin</run_depend>
-  <run_depend>libgsl</run_depend>
+  <buildtool_depend>catkin</buildtool_depend>
+  <build_depend>libgsl</build_depend>
   <export />
 </package>
diff --git a/sm/apps/test_json.c b/sm/apps/test_json.c
@@ -5,7 +5,7 @@ int main() {
 	LDP ld = ld_alloc_new(50);
 	JO jo = ld_to_json(ld);
 
-	printf(json_object_to_json_string(jo));
+	printf("%s", json_object_to_json_string(jo));
 
 	return 0;
 }
diff --git a/sm/apps/test_json_ld.c b/sm/apps/test_json_ld.c
@@ -8,13 +8,13 @@ int main() {
 		if(!(ld = json_to_ld(jo))) {
 			fprintf(stderr, "Could not transform to laser_data:\n\n");
 			fprintf(stderr, "-----\n");
-			fprintf(stderr, json_object_to_json_string(jo));
+			fprintf(stderr, "%s", json_object_to_json_string(jo));
 			fprintf(stderr, "-----\n");
 			continue;
 		}
 
 		jo = ld_to_json(ld);
-		printf(json_object_to_json_string(jo));
+		printf("%s", json_object_to_json_string(jo));
 		printf("\n");
 	}
 

diff --git a/sm/lib/options/options.c b/sm/lib/options/options.c
@@ -396,7 +396,7 @@ void options_dump(struct option * options, FILE*f, int write_desc) {
 }
 
 void options_print_help(struct option * options, FILE*f) {
-	fprintf(f, options_banner_string);
+	fprintf(f, "%s", options_banner_string);
 	fprintf(f, 
 	"Generic options: \n"
 	"  -help          Displays this help.\n"