From 1c7e4b483e045a5be3ec4d8e394775ba6d0e5d2b Mon Sep 17 00:00:00 2001 From: uz Date: Wed, 17 Aug 2011 15:55:44 +0000 Subject: [PATCH] Shortened some of the function names. git-svn-id: svn://svn.cc65.org/cc65/trunk@5192 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- src/dbginfo/dbginfo.c | 27 ++++++++++++++------------- src/dbginfo/dbginfo.h | 34 ++++++++++++++++------------------ 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/src/dbginfo/dbginfo.c b/src/dbginfo/dbginfo.c index de412aa62..9092af60f 100644 --- a/src/dbginfo/dbginfo.c +++ b/src/dbginfo/dbginfo.c @@ -4663,7 +4663,7 @@ const cc65_libraryinfo* cc65_get_librarylist (cc65_dbginfo Handle) -const cc65_libraryinfo* cc65_libraryinfo_byid (cc65_dbginfo Handle, unsigned Id) +const cc65_libraryinfo* cc65_library_byid (cc65_dbginfo Handle, unsigned Id) /* Return information about a library with a specific id. The function * returns NULL if the id is invalid (no such library) and otherwise a * cc65_libraryinfo structure with one entry that contains the requested @@ -4714,8 +4714,8 @@ void cc65_free_libraryinfo (cc65_dbginfo Handle, const cc65_libraryinfo* Info) -const cc65_lineinfo* cc65_lineinfo_byline (cc65_dbginfo Handle, unsigned FileId, - cc65_line Line) +const cc65_lineinfo* cc65_line_bynumber (cc65_dbginfo Handle, unsigned FileId, + cc65_line Line) /* Return line information for a source file/line number combination. The * function returns NULL if no line information was found. */ @@ -4805,7 +4805,7 @@ const cc65_moduleinfo* cc65_get_modulelist (cc65_dbginfo Handle) -const cc65_moduleinfo* cc65_moduleinfo_byid (cc65_dbginfo Handle, unsigned Id) +const cc65_moduleinfo* cc65_module_byid (cc65_dbginfo Handle, unsigned Id) /* Return information about a module with a specific id. The function * returns NULL if the id is invalid (no such module) and otherwise a * cc65_moduleinfo structure with one entry that contains the requested @@ -4884,7 +4884,7 @@ const cc65_spaninfo* cc65_get_spanlist (cc65_dbginfo Handle) -const cc65_spaninfo* cc65_spaninfo_byid (cc65_dbginfo Handle, unsigned Id) +const cc65_spaninfo* cc65_span_byid (cc65_dbginfo Handle, unsigned Id) /* Return information about a span with a specific id. The function * returns NULL if the id is invalid (no such span) and otherwise a * cc65_spaninfo structure with one entry that contains the requested @@ -4917,7 +4917,7 @@ const cc65_spaninfo* cc65_spaninfo_byid (cc65_dbginfo Handle, unsigned Id) -const cc65_spaninfo* cc65_spaninfo_byaddr (cc65_dbginfo Handle, unsigned long Addr) +const cc65_spaninfo* cc65_span_byaddr (cc65_dbginfo Handle, unsigned long Addr) /* Return span information for the given address. The function returns NULL * if no spans were found for this address. */ @@ -4954,7 +4954,7 @@ const cc65_spaninfo* cc65_spaninfo_byaddr (cc65_dbginfo Handle, unsigned long Ad -const cc65_spaninfo* cc65_spaninfo_byline (cc65_dbginfo Handle, unsigned LineId) +const cc65_spaninfo* cc65_span_byline (cc65_dbginfo Handle, unsigned LineId) /* Return span information for the given source line. The function returns NULL * if the line id is invalid, otherwise the spans for this line (possibly zero). */ @@ -4993,7 +4993,7 @@ const cc65_spaninfo* cc65_spaninfo_byline (cc65_dbginfo Handle, unsigned LineId) -const cc65_spaninfo* cc65_spaninfo_byscope (cc65_dbginfo Handle, unsigned ScopeId) +const cc65_spaninfo* cc65_span_byscope (cc65_dbginfo Handle, unsigned ScopeId) /* Return span information for the given scope. The function returns NULL if * the scope id is invalid, otherwise the spans for this scope (possibly zero). */ @@ -5082,7 +5082,7 @@ const cc65_sourceinfo* cc65_get_sourcelist (cc65_dbginfo Handle) -const cc65_sourceinfo* cc65_sourceinfo_byid (cc65_dbginfo Handle, unsigned Id) +const cc65_sourceinfo* cc65_source_byid (cc65_dbginfo Handle, unsigned Id) /* Return information about a source file with a specific id. The function * returns NULL if the id is invalid (no such source file) and otherwise a * cc65_sourceinfo structure with one entry that contains the requested @@ -5116,7 +5116,7 @@ const cc65_sourceinfo* cc65_sourceinfo_byid (cc65_dbginfo Handle, unsigned Id) -const cc65_sourceinfo* cc65_sourceinfo_bymodule (cc65_dbginfo Handle, unsigned Id) +const cc65_sourceinfo* cc65_source_bymodule (cc65_dbginfo Handle, unsigned Id) /* Return information about the source files used to build a module. The * function returns NULL if the module id is invalid (no such module) and * otherwise a cc65_sourceinfo structure with one entry per source file. @@ -5201,7 +5201,7 @@ const cc65_segmentinfo* cc65_get_segmentlist (cc65_dbginfo Handle) -const cc65_segmentinfo* cc65_segmentinfo_byid (cc65_dbginfo Handle, unsigned Id) +const cc65_segmentinfo* cc65_segment_byid (cc65_dbginfo Handle, unsigned Id) /* Return information about a segment with a specific id. The function returns * NULL if the id is invalid (no such segment) and otherwise a segmentinfo * structure with one entry that contains the requested segment information. @@ -5233,8 +5233,8 @@ const cc65_segmentinfo* cc65_segmentinfo_byid (cc65_dbginfo Handle, unsigned Id) -const cc65_segmentinfo* cc65_segmentinfo_byname (cc65_dbginfo Handle, - const char* Name) +const cc65_segmentinfo* cc65_segment_byname (cc65_dbginfo Handle, + const char* Name) /* Return information about a segment with a specific name. The function * returns NULL if no segment with this name exists and otherwise a * cc65_segmentinfo structure with one entry that contains the requested @@ -5577,3 +5577,4 @@ void cc65_free_scopeinfo (cc65_dbginfo Handle, const cc65_scopeinfo* Info) + diff --git a/src/dbginfo/dbginfo.h b/src/dbginfo/dbginfo.h index b9d0627a2..62cc68e70 100644 --- a/src/dbginfo/dbginfo.h +++ b/src/dbginfo/dbginfo.h @@ -132,7 +132,7 @@ struct cc65_libraryinfo { const cc65_libraryinfo* cc65_get_librarylist (cc65_dbginfo handle); /* Return a list of all libraries */ -const cc65_libraryinfo* cc65_libraryinfo_byid (cc65_dbginfo handle, unsigned id); +const cc65_libraryinfo* cc65_library_byid (cc65_dbginfo handle, unsigned id); /* Return information about a library with a specific id. The function * returns NULL if the id is invalid (no such library) and otherwise a * cc65_libraryinfo structure with one entry that contains the requested @@ -175,9 +175,9 @@ struct cc65_lineinfo { -const cc65_lineinfo* cc65_lineinfo_byline (cc65_dbginfo handle, - unsigned source_id, - cc65_line line); +const cc65_lineinfo* cc65_line_bynumber (cc65_dbginfo handle, + unsigned source_id, + cc65_line line); /* Return line information for a source file/line number combination. The * function returns NULL if no line information was found. */ @@ -214,7 +214,7 @@ struct cc65_moduleinfo { const cc65_moduleinfo* cc65_get_modulelist (cc65_dbginfo handle); /* Return a list of all modules */ -const cc65_moduleinfo* cc65_moduleinfo_byid (cc65_dbginfo handle, unsigned id); +const cc65_moduleinfo* cc65_module_byid (cc65_dbginfo handle, unsigned id); /* Return information about a module with a specific id. The function * returns NULL if the id is invalid (no such module) and otherwise a * cc65_moduleinfo structure with one entry that contains the requested @@ -252,27 +252,25 @@ struct cc65_spaninfo { const cc65_spaninfo* cc65_get_spanlist (cc65_dbginfo handle); /* Return a list of all spans. BEWARE: Large! */ -const cc65_spaninfo* cc65_spaninfo_byid (cc65_dbginfo handle, unsigned id); +const cc65_spaninfo* cc65_span_byid (cc65_dbginfo handle, unsigned id); /* Return information about a span with a specific id. The function * returns NULL if the id is invalid (no such span) and otherwise a * cc65_spaninfo structure with one entry that contains the requested * span information. */ -const cc65_spaninfo* cc65_spaninfo_byaddr (cc65_dbginfo handle, - unsigned long addr); +const cc65_spaninfo* cc65_span_byaddr (cc65_dbginfo handle, + unsigned long addr); /* Return span information for the given address. The function returns NULL * if no spans were found for this address. */ -const cc65_spaninfo* cc65_spaninfo_byline (cc65_dbginfo handle, - unsigned line_id); +const cc65_spaninfo* cc65_span_byline (cc65_dbginfo handle, unsigned line_id); /* Return span information for the given source line. The function returns NULL * if the line id is invalid, otherwise the spans for this line (possibly zero). */ -const cc65_spaninfo* cc65_spaninfo_byscope (cc65_dbginfo handle, - unsigned scope_id); +const cc65_spaninfo* cc65_span_byscope (cc65_dbginfo handle, unsigned scope_id); /* Return span information for the given scope. The function returns NULL if * the scope id is invalid, otherwise the spans for this scope (possibly zero). */ @@ -308,15 +306,15 @@ struct cc65_sourceinfo { const cc65_sourceinfo* cc65_get_sourcelist (cc65_dbginfo handle); /* Return a list of all source files */ -const cc65_sourceinfo* cc65_sourceinfo_byid (cc65_dbginfo handle, unsigned id); +const cc65_sourceinfo* cc65_source_byid (cc65_dbginfo handle, unsigned id); /* Return information about a source file with a specific id. The function * returns NULL if the id is invalid (no such source file) and otherwise a * cc65_sourceinfo structure with one entry that contains the requested * source file information. */ -const cc65_sourceinfo* cc65_sourceinfo_bymodule (cc65_dbginfo handle, - unsigned module_id); +const cc65_sourceinfo* cc65_source_bymodule (cc65_dbginfo handle, + unsigned module_id); /* Return information about the source files used to build a module. The * function returns NULL if the module id is invalid (no such module) and * otherwise a cc65_sourceinfo structure with one entry per source file. @@ -361,14 +359,14 @@ struct cc65_segmentinfo { const cc65_segmentinfo* cc65_get_segmentlist (cc65_dbginfo handle); /* Return a list of all segments referenced in the debug information */ -const cc65_segmentinfo* cc65_segmentinfo_byid (cc65_dbginfo handle, unsigned id); +const cc65_segmentinfo* cc65_segment_byid (cc65_dbginfo handle, unsigned id); /* Return information about a segment with a specific id. The function returns * NULL if the id is invalid (no such segment) and otherwise a cc65_segmentinfo * structure with one entry that contains the requested segment information. */ -const cc65_segmentinfo* cc65_segmentinfo_byname (cc65_dbginfo handle, - const char* name); +const cc65_segmentinfo* cc65_segment_byname (cc65_dbginfo handle, + const char* name); /* Return information about a segment with a specific name. The function * returns NULL if no segment with this name exists and otherwise a * cc65_segmentinfo structure with one entry that contains the requested -- 2.39.5