Update FSF address

[lttv.git] / lttv / modules / text / formattedDump.c

diff --git a/lttv/modules/text/formattedDump.c b/lttv/modules/text/formattedDump.c
index fa2422e7d5fac1159ff46ef78c349da1ec5c19d2..35c55e798096e98fc7773cf41e92c96e1aab24f0 100644 (file)
--- a/lttv/modules/text/formattedDump.c
+++ b/lttv/modules/text/formattedDump.c
@@ -15,8 +15,8 @@
  *
  * 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.
  */
 
 /*
@@ -60,9 +60,9 @@ static LttvHooks *event_hook;
 
 static const char default_format[] =
                "channel:%c event:%e timestamp:%t elapsed:%l cpu:%u pid:%d "
-               "ppid:%i tgpid:%g process:%p brand:%b state:%a payload:{ %m }";
+               "ppid:%i tgpid:%g process:%p state:%a payload:{ %m }";
 static const char textDump_format[] =
-               "%c.%e: %s.%n (%r/%c_%u), %d, %g, %p, %b, %i, %y, %a { %m }";
+               "%c.%e: %s.%n (%r/%c_%u), %d, %g, %p, %i, %y, %a { %m }";
 static const char strace_format[] = "%e(%m) %s.%n";
 static const char *fmt;
 
@@ -142,7 +142,7 @@ static int write_event_content(void *hook_data, void *call_data)
 
        /*
         * By default, metadata's channel won't be display: it goes directly
-        * to the next event. You can have metadata's informations with -M
+        * to the next event. You can have metadata's information with -M
         * switch (a_meta option).
         */
        if (!a_meta && ltt_tracefile_name(tfs->parent.tf) ==
@@ -254,10 +254,6 @@ void lttv_event_to_string(LttEvent *e, GString *string_buffer, gboolean mandator
                                g_string_append(string_buffer,
                                                g_quark_to_string(process->name));
                                break;
-                       case 'b':
-                               g_string_append(string_buffer,
-                                               g_quark_to_string(process->brand));
-                               break;
                        case 'u':
                                g_string_append_printf(string_buffer, "%u", cpu);
                                break;
@@ -341,7 +337,7 @@ static void init()
 
        a_meta = FALSE;
        lttv_option_add("metadata", 'M',
-                       "add metadata informations",
+                       "add metadata information",
                        "",
                        LTTV_OPT_NONE, &a_meta, NULL, NULL);
 
@@ -363,7 +359,6 @@ static void init()
                        "               %i   ppid\n"
                        "               %g   tgid\n"
                        "               %u   cpu\n"
-                       "               %b   brand\n"
                        "               %a   state\n"
                        "               %y   memory address\n"
                        "               %m   markers and tracepoints fields\n",