Add __FILE__ and __LINE__ parameter to internal_error() /

[deliverable/binutils-gdb.git] / gdb / event-loop.c

diff --git a/gdb/event-loop.c b/gdb/event-loop.c
index 21b606d48fe132cbc73f9647d9ec38abffe81dbc..300fe56931cd1aa0e29ee9f56053739d1f2c0849 100644 (file)
--- a/gdb/event-loop.c
+++ b/gdb/event-loop.c
@@ -1,5 +1,5 @@
 /* Event loop machinery for GDB, the GNU debugger.
-   Copyright 1999 Free Software Foundation, Inc.
+   Copyright 1999, 2001 Free Software Foundation, Inc.
    Written by Elena Zannoni <ezannoni@cygnus.com> of Cygnus Solutions.
 
    This file is part of GDB.
@@ -33,7 +33,7 @@
 #endif
 
 #include <sys/types.h>
-#include <string.h>
+#include "gdb_string.h"
 #include <errno.h>
 #include <setjmp.h>
 #include <sys/time.h>
@@ -96,7 +96,7 @@ typedef void (event_handler_func) (int);
    ready. The procedure PROC associated with each event is always the
    same (handle_file_event).  Its duty is to invoke the handler
    associated with the file descriptor whose state change generated
-   the event, plus doing other cleanups adn such. */
+   the event, plus doing other cleanups and such. */
 
 struct gdb_event
   {
@@ -248,7 +248,7 @@ static struct
   }
 sighandler_list;
 
-/* Is any of the handlers ready?  Check this variable using
+/* Are any of the handlers ready?  Check this variable using
    check_async_ready. This is used by process_event, to determine
    whether or not to invoke the invoke_async_signal_handler
    function. */
@@ -377,7 +377,7 @@ process_event (void)
          if (event_ptr->next_event == NULL)
            event_queue.last_event = prev_ptr;
        }
-      free ((char *) event_ptr);
+      xfree (event_ptr);
 
       /* Now call the procedure associated with the event. */
       (*proc) (fd);
@@ -392,7 +392,7 @@ process_event (void)
    wait for something to happen (via gdb_wait_for_event), then process
    it.  Returns >0 if something was done otherwise returns <0 (this
    can happen if there are no event sources to wait for).  If an error
-   occures catch_errors() which calls this function returns zero. */
+   occurs catch_errors() which calls this function returns zero. */
 
 static int
 gdb_do_one_event (void *data)
@@ -484,7 +484,8 @@ add_file_handler (int fd, handler_func * proc, gdb_client_data client_data)
       if (poll (&fds, 1, 0) == 1 && (fds.revents & POLLNVAL))
        use_poll = 0;
 #else
-      internal_error ("event-loop.c : use_poll without HAVE_POLL");
+      internal_error (__FILE__, __LINE__,
+                     "use_poll without HAVE_POLL");
 #endif /* HAVE_POLL */
     }
   if (use_poll)
@@ -492,7 +493,8 @@ add_file_handler (int fd, handler_func * proc, gdb_client_data client_data)
 #ifdef HAVE_POLL
       create_file_handler (fd, POLLIN, proc, client_data);
 #else
-      internal_error ("event-loop.c : use_poll without HAVE_POLL");
+      internal_error (__FILE__, __LINE__,
+                     "use_poll without HAVE_POLL");
 #endif
     }
   else
@@ -552,7 +554,8 @@ create_file_handler (int fd, int mask, handler_func * proc, gdb_client_data clie
       (gdb_notifier.poll_fds + gdb_notifier.num_fds - 1)->events = mask;
       (gdb_notifier.poll_fds + gdb_notifier.num_fds - 1)->revents = 0;
 #else
-      internal_error ("event-loop.c : use_poll without HAVE_POLL");
+      internal_error (__FILE__, __LINE__,
+                     "use_poll without HAVE_POLL");
 #endif /* HAVE_POLL */
     }
   else
@@ -620,11 +623,12 @@ delete_file_handler (int fd)
              j++;
            }
        }
-      free (gdb_notifier.poll_fds);
+      xfree (gdb_notifier.poll_fds);
       gdb_notifier.poll_fds = new_poll_fds;
       gdb_notifier.num_fds--;
 #else
-      internal_error ("event-loop.c : use_poll without HAVE_POLL");
+      internal_error (__FILE__, __LINE__,
+                     "use_poll without HAVE_POLL");
 #endif /* HAVE_POLL */
     }
   else
@@ -668,7 +672,7 @@ delete_file_handler (int fd)
        ;
       prev_ptr->next_file = file_ptr->next_file;
     }
-  free ((char *) file_ptr);
+  xfree (file_ptr);
 }
 
 /* Handle the given event by calling the procedure associated to the
@@ -725,7 +729,8 @@ handle_file_event (int event_file_desc)
              else
                file_ptr->error = 0;
 #else
-             internal_error ("event-loop.c : use_poll without HAVE_POLL");
+             internal_error (__FILE__, __LINE__,
+                             "use_poll without HAVE_POLL");
 #endif /* HAVE_POLL */
            }
          else
@@ -786,7 +791,8 @@ gdb_wait_for_event (void)
       if (num_found == -1 && errno != EINTR)
        perror_with_name ("Poll");
 #else
-      internal_error ("event-loop.c : use_poll without HAVE_POLL");
+      internal_error (__FILE__, __LINE__,
+                     "use_poll without HAVE_POLL");
 #endif /* HAVE_POLL */
     }
   else
@@ -847,7 +853,8 @@ gdb_wait_for_event (void)
          file_ptr->ready_mask = (gdb_notifier.poll_fds + i)->revents;
        }
 #else
-      internal_error ("event-loop.c : use_poll without HAVE_POLL");
+      internal_error (__FILE__, __LINE__,
+                     "use_poll without HAVE_POLL");
 #endif /* HAVE_POLL */
     }
   else
@@ -973,7 +980,7 @@ delete_async_signal_handler (async_signal_handler ** async_handler_ptr)
       if (sighandler_list.last_handler == (*async_handler_ptr))
        sighandler_list.last_handler = prev_ptr;
     }
-  free ((char *) (*async_handler_ptr));
+  xfree ((*async_handler_ptr));
   (*async_handler_ptr) = NULL;
 }
 
@@ -1080,7 +1087,7 @@ delete_timer (int id)
        ;
       prev_timer->next = timer_ptr->next;
     }
-  free ((char *) timer_ptr);
+  xfree (timer_ptr);
 
   gdb_notifier.timeout_valid = 0;
 }
@@ -1111,7 +1118,7 @@ handle_timer_event (int dummy)
       timer_ptr = timer_ptr->next;
       /* Call the procedure associated with that timer. */
       (*saved_timer->proc) (saved_timer->client_data);
-      free (saved_timer);
+      xfree (saved_timer);
     }
 
   gdb_notifier.timeout_valid = 0;
@@ -1167,7 +1174,8 @@ poll_timers (void)
 #ifdef HAVE_POLL
          gdb_notifier.poll_timeout = delta.tv_sec * 1000;
 #else
-         internal_error ("event-loop.c : use_poll without HAVE_POLL");
+         internal_error (__FILE__, __LINE__,
+                         "use_poll without HAVE_POLL");
 #endif /* HAVE_POLL */
        }
       else