summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2017-02-24 14:02:31 +0000
committerVincent Sanders <vince@kyllikki.org>2017-02-24 14:02:31 +0000
commitd9a2c7b9c155256a322e66ce3aec6dfe0147941c (patch)
tree5a8b8eaf62486c02aa33d1b8a5f71b03b7c056bb
parent07c8ea22a5b1d8e10db20a24127332da8c7e2b72 (diff)
downloadnetsurf-d9a2c7b9c155256a322e66ce3aec6dfe0147941c.tar.gz
netsurf-d9a2c7b9c155256a322e66ce3aec6dfe0147941c.tar.bz2
fix some doxygen errors
-rw-r--r--content/urldb.c2
-rw-r--r--desktop/knockout.c2
-rw-r--r--desktop/save_complete.c6
-rw-r--r--frontends/cocoa/bitmap.m19
-rw-r--r--frontends/windows/filetype.c3
-rw-r--r--render/html.h6
-rw-r--r--render/html_redraw.c8
7 files changed, 24 insertions, 22 deletions
diff --git a/content/urldb.c b/content/urldb.c
index a26e785c8..60944f7e5 100644
--- a/content/urldb.c
+++ b/content/urldb.c
@@ -118,7 +118,7 @@
/**
* cookie entry.
*
- * \warn This *must* be kept in sync with the public interface in
+ * \warning This *must* be kept in sync with the public interface in
* netsurf/cookie_db.h
*/
struct cookie_internal_data {
diff --git a/desktop/knockout.c b/desktop/knockout.c
index ee66c17d2..7e964fc84 100644
--- a/desktop/knockout.c
+++ b/desktop/knockout.c
@@ -609,7 +609,7 @@ knockout_plot_line(const struct redraw_context *ctx,
* rule.
*
* \param ctx The current redraw context.
- * \param style Style controlling the polygon plot.
+ * \param pstyle Style controlling the polygon plot.
* \param p verticies of polygon
* \param n number of verticies.
* \return NSERROR_OK on success else error code.
diff --git a/desktop/save_complete.c b/desktop/save_complete.c
index f8f005743..d6fb2feb1 100644
--- a/desktop/save_complete.c
+++ b/desktop/save_complete.c
@@ -637,9 +637,9 @@ static bool save_complete_handle_attr_value(save_complete_ctx *ctx,
*
* Attribute: Elements:
*
- * 1) data <object>
- * 2) href <a> <area> <link>
- * 3) src <script> <input> <frame> <iframe> <img>
+ * 1) data object
+ * 2) href a, area, link
+ * 3) src script, input, frame, iframe, img
* 4) background any (except those above)
*/
/* 1 */
diff --git a/frontends/cocoa/bitmap.m b/frontends/cocoa/bitmap.m
index 1ab8c3e2f..fe611f118 100644
--- a/frontends/cocoa/bitmap.m
+++ b/frontends/cocoa/bitmap.m
@@ -41,7 +41,16 @@
#define ALPHA_OFFSET (3)
static CGImageRef cocoa_prepare_bitmap( void *bitmap );
-static NSMapTable *cocoa_get_bitmap_cache( void );
+//static NSMapTable *cocoa_get_bitmap_cache( void );
+
+static inline NSMapTable *cocoa_get_bitmap_cache( void )
+{
+ static NSMapTable *cache = nil;
+ if (cache == nil) {
+ cache = NSCreateMapTable( NSNonOwnedPointerMapKeyCallBacks, NSNonOwnedPointerMapValueCallBacks, 0 );
+ }
+ return cache;
+}
static int bitmap_get_width(void *bitmap)
{
@@ -179,14 +188,6 @@ CGImageRef cocoa_get_cgimage( void *bitmap )
return result;
}
-static inline NSMapTable *cocoa_get_bitmap_cache( void )
-{
- static NSMapTable *cache = nil;
- if (cache == nil) {
- cache = NSCreateMapTable( NSNonOwnedPointerMapKeyCallBacks, NSNonOwnedPointerMapValueCallBacks, 0 );
- }
- return cache;
-}
static CGImageRef cocoa_prepare_bitmap( void *bitmap )
{
diff --git a/frontends/windows/filetype.c b/frontends/windows/filetype.c
index 4e7f2f425..d31434aeb 100644
--- a/frontends/windows/filetype.c
+++ b/frontends/windows/filetype.c
@@ -17,7 +17,8 @@
*/
/**
- * \file Fetch operation implementation for win32
+ * \file
+ * Fetch operation implementation for win32
*/
#include <stdlib.h>
diff --git a/render/html.h b/render/html.h
index b8429fd17..30219a3bd 100644
--- a/render/html.h
+++ b/render/html.h
@@ -88,7 +88,7 @@ struct html_script {
};
-/** An object (<img>, <object>, etc.) in a CONTENT_HTML document. */
+/** An object (img, object, etc. tag) in a CONTENT_HTML document. */
struct content_html_object {
struct content *parent; /**< Parent document */
struct content_html_object *next; /**< Next in chain */
@@ -105,7 +105,7 @@ struct html_scrollbar_data {
struct box *box;
};
-/** Frame tree (<frameset>, <frame>) */
+/** Frame tree (frameset or frame tag) */
struct content_html_frames {
int cols; /** number of columns in frameset */
int rows; /** number of rows in frameset */
@@ -126,7 +126,7 @@ struct content_html_frames {
struct content_html_frames *children; /** [cols * rows] children */
};
-/** Inline frame list (<iframe>) */
+/** Inline frame list (iframe tag) */
struct content_html_iframe {
struct box *box;
diff --git a/render/html_redraw.c b/render/html_redraw.c
index 598e613ca..2f8730634 100644
--- a/render/html_redraw.c
+++ b/render/html_redraw.c
@@ -567,6 +567,10 @@ static bool html_redraw_file(int x, int y, int width, int height,
/**
* Plot background images.
*
+ * The reason for the presence of \a background is the backwards compatibility
+ * mess that is backgrounds on &lt;body&gt;. The background will be drawn relative
+ * to \a box, using the background information contained within \a background.
+ *
* \param x coordinate of box
* \param y coordinate of box
* \param box box to draw background image of
@@ -576,10 +580,6 @@ static bool html_redraw_file(int x, int y, int width, int height,
* \param background box containing background details (usually \a box)
* \param ctx current redraw context
* \return true if successful, false otherwise
- *
- * The reason for the presence of ::background is the backwards compatibility
- * mess that is backgrounds on &lt;body&gt;. The background will be drawn relative
- * to \a box, using the background information contained within \a background.
*/
static bool html_redraw_background(int x, int y, struct box *box, float scale,