From 1f8b0dffac11b11fa7b582b6274c6b4cadf57bb3 Mon Sep 17 00:00:00 2001
From: Pierre-Marc Fournier <pierre-marc.fournier@polymtl.ca>
Date: Tue, 3 Mar 2009 16:53:32 -0500
Subject: [PATCH] ust: cleanup and add some licences

---
 hello/hello.c           | 13 +++----------
 libmarkers/tracepoint.c | 14 +++++++++-----
 libmarkers/tracepoint.h | 20 +++++++++++++++-----
 ustd/ustd.c             | 17 +++++++++++++++++
 4 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/hello/hello.c b/hello/hello.c
index 5f05e22..821bed3 100644
--- a/hello/hello.c
+++ b/hello/hello.c
@@ -6,7 +6,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include "../libmarkers/marker.h"
+#include "marker.h"
 #include "usterr.h"
 #include "tracer.h"
 #include "marker-control.h"
@@ -14,13 +14,6 @@
 #include "tp.h"
 
 
-void probe(const struct marker *mdata,
-		void *probe_private, void *call_private,
-		const char *fmt, va_list *args)
-{
-	printf("In probe\n");
-}
-
 void inthandler(int sig)
 {
 	printf("in handler\n");
@@ -81,5 +74,5 @@ int main()
 	return 0;
 }
 
-MARKER_LIB
-TRACEPOINT_LIB
+MARKER_LIB;
+TRACEPOINT_LIB;
diff --git a/libmarkers/tracepoint.c b/libmarkers/tracepoint.c
index 16292e4..ba4509b 100644
--- a/libmarkers/tracepoint.c
+++ b/libmarkers/tracepoint.c
@@ -1,10 +1,11 @@
 /*
  * Copyright (C) 2008 Mathieu Desnoyers
+ * Copyright (C) 2009 Pierre-Marc Fournier
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,8 +14,11 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * Ported to userspace by Pierre-Marc Fournier.
  */
+
 //ust// #include <linux/module.h>
 //ust// #include <linux/mutex.h>
 //ust// #include <linux/types.h>
diff --git a/libmarkers/tracepoint.h b/libmarkers/tracepoint.h
index fda2aba..6f14ea0 100644
--- a/libmarkers/tracepoint.h
+++ b/libmarkers/tracepoint.h
@@ -2,16 +2,26 @@
 #define _LINUX_TRACEPOINT_H
 
 /*
- * Kernel Tracepoint API.
+ * Copyright (C) 2008 Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
+ * Copyright (C) 2009 Pierre-Marc Fournier
  *
- * See Documentation/tracepoint.txt.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * (C) Copyright 2008 Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * Heavily inspired from the Linux Kernel Markers.
  *
- * This file is released under the GPLv2.
- * See the file COPYING for more details.
+ * Ported to userspace by Pierre-Marc Fournier.
  */
 
 //#include <linux/immediate.h>
diff --git a/ustd/ustd.c b/ustd/ustd.c
index 8205ed2..830d5e2 100644
--- a/ustd/ustd.c
+++ b/ustd/ustd.c
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2009  Pierre-Marc Fournier
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #define _GNU_SOURCE
 
 #include <sys/types.h>
-- 
2.34.1