X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fmsg-locator.c;h=d29f35db9375cca79dfe6a572f0ad55fd87fd15f;hb=086322fd8c85a303ba6f552950d6f057f2867add;hp=5f7e5dd0d87324525ade1a34fdab5f8d831629ee;hpb=b8b67a1e1f709640ccdb3422a591b938edb0ceea;p=pspp-builds.git

diff --git a/src/libpspp/msg-locator.c b/src/libpspp/msg-locator.c
index 5f7e5dd0..d29f35db 100644
--- a/src/libpspp/msg-locator.c
+++ b/src/libpspp/msg-locator.c
@@ -1,29 +1,31 @@
-/* PSPP - computes sample statistics.
-   Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
-   Written by Ben Pfaff <blp@gnu.org>.
+/* PSPP - a program for statistical analysis.
+   Copyright (C) 1997-9, 2000, 2006, 2011 Free Software Foundation, Inc.
 
-   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 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.
+   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. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
+
+#include "libpspp/msg-locator.h"
+
 #include <stdlib.h>
-#include <libpspp/alloc.h>
-#include "msg-locator.h"
-#include <libpspp/message.h>
-#include <libpspp/assertion.h>
-#include "getl.h"
+
+#include "libpspp/assertion.h"
+#include "libpspp/cast.h"
+#include "libpspp/message.h"
+#include "libpspp/getl.h"
+
+#include "gl/xalloc.h"
 
 /* File locator stack. */
 static const struct msg_locator **file_loc;
@@ -71,7 +73,7 @@ msg_pop_msg_locator (const struct msg_locator *loc)
 /* Puts the current file and line number into LOC, or NULL and -1 if
    none. */
 void
-get_msg_location (struct msg_locator *loc)
+get_msg_location (const struct source_stream *ss, struct msg_locator *loc)
 {
   if (nfile_loc)
     {
@@ -79,7 +81,7 @@ get_msg_location (struct msg_locator *loc)
     }
   else
     {
-      loc->file_name = getl_source_name ();
-      loc->line_number = getl_source_location ();
+      loc->file_name = CONST_CAST (char *, getl_source_name (ss));
+      loc->line_number = getl_source_location (ss);
     }
 }