Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/bcce8cc7b41f869fa2b022f85622cd389082d0f5
...commit
http://git.netsurf-browser.org/netsurf.git/commit/bcce8cc7b41f869fa2b022f85622cd389082d0f5
...tree
http://git.netsurf-browser.org/netsurf.git/tree/bcce8cc7b41f869fa2b022f85622cd389082d0f5
The branch, master has been updated
via bcce8cc7b41f869fa2b022f85622cd389082d0f5 (commit)
via f679a9b1d6b652e06c24d543c7c5921753e3071b (commit)
from d436992eb2a28e2e056e96e42072b13d89b44a0b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=bcce8cc7b41f869fa2b022f85622cd389082d0f5
commit bcce8cc7b41f869fa2b022f85622cd389082d0f5
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
fix spelling of retrived
diff --git a/content/backing_store.h b/content/backing_store.h
index 4e29511..3a1ae8f 100644
--- a/content/backing_store.h
+++ b/content/backing_store.h
@@ -38,7 +38,7 @@ enum backing_store_flags {
* low level cache backing store operation table
*
* The low level cache (source objects) has the capability to make
- * objects and their metadata (headers etc) persistant by writing to a
+ * objects and their metadata (headers etc) persistent by writing to a
* backing store using these operations.
*/
struct gui_llcache_table {
@@ -46,14 +46,14 @@ struct gui_llcache_table {
* Initialise the backing store.
*
* @param parameters to configure backing store.
- * @return NSERROR_OK on success or error code on faliure.
+ * @return NSERROR_OK on success or error code on failure.
*/
nserror (*initialise)(const struct llcache_store_parameters
*parameters);
/**
* Finalise the backing store.
*
- * @return NSERROR_OK on success or error code on faliure.
+ * @return NSERROR_OK on success or error code on failure.
*/
nserror (*finalise)(void);
@@ -72,16 +72,16 @@ struct gui_llcache_table {
* been completely written on return.
*
* @param[in] url The url is used as the unique primary key for the
data.
- * @param[in] flags The flags to control how the obejct is stored.
+ * @param[in] flags The flags to control how the object is stored.
* @param[in] data The objects data.
* @param[in] datalen The length of the \a data.
- * @return NSERROR_OK on success or error code on faliure.
+ * @return NSERROR_OK on success or error code on failure.
*/
nserror (*store)(struct nsurl *url, enum backing_store_flags flags,
uint8_t *data, const size_t datalen);
/**
- * Retrive an object from the backing store.
+ * Retrieve an object from the backing store.
*
* The backing store will manage its own memory and the
* allocations returned in \a data *must* not be altered.
@@ -91,10 +91,10 @@ struct gui_llcache_table {
* calling the release method.
*
* @param[in] url The url is used as the unique primary key for the
data.
- * @param[in] flags The flags to control how the object is retrived.
- * @param[out] data The retrived objects data.
+ * @param[in] flags The flags to control how the object is retrieved.
+ * @param[out] data The retrieved objects data.
* @param[out] datalen The length of the \a data retrieved.
- * @return NSERROR_OK on success or error code on faliure.
+ * @return NSERROR_OK on success or error code on failure.
*/
nserror (*fetch)(struct nsurl *url, enum backing_store_flags flags,
uint8_t **data, size_t *datalen);
@@ -104,7 +104,7 @@ struct gui_llcache_table {
*
* @param url The url is used as the unique primary key to invalidate.
* @param[in] flags The flags to control how the object data is
released.
- * @return NSERROR_OK on success or error code on faliure.
+ * @return NSERROR_OK on success or error code on failure.
*/
nserror (*release)(struct nsurl *url, enum backing_store_flags flags);
@@ -117,7 +117,7 @@ struct gui_llcache_table {
* If the entry had data allocated it will be released.
*
* @param url The url is used as the unique primary key to invalidate.
- * @return NSERROR_OK on success or error code on faliure.
+ * @return NSERROR_OK on success or error code on failure.
*/
nserror (*invalidate)(struct nsurl *url);
diff --git a/content/handlers/css/hints.h b/content/handlers/css/hints.h
index 2c18359..3d44d21 100644
--- a/content/handlers/css/hints.h
+++ b/content/handlers/css/hints.h
@@ -31,8 +31,8 @@ void css_hint_fini(void);
*
* \param[in] pw HTML document
* \param[in] node DOM node
- * \param[out] nhints number of hints retrived
- * \param[out] hints retrived hints
+ * \param[out] nhints number of hints retrieved
+ * \param[out] hints retrieved hints
* \return CSS_OK on success,
* CSS_PROPERTY_NOT_SET if there is no hint for the requested property,
* CSS_NOMEM on memory exhaustion.
diff --git a/desktop/searchweb.c b/desktop/searchweb.c
index 593591c..29a998e 100644
--- a/desktop/searchweb.c
+++ b/desktop/searchweb.c
@@ -60,7 +60,7 @@ static const char *default_search_icon_url =
"resource:icons/search.png";
/**
* Read providers file.
*
- * Allocates stoage of sufficient size for the providers file and
+ * Allocates storage of sufficient size for the providers file and
* reads the entire file in.
*
* \param fname The filename to read.
@@ -132,7 +132,7 @@ read_providers(const char *fname,
* \param providers_size The size of the provider data.
* \param providers_out The resulting provider array.
* \param providers_count The number of providers in the output array.
- * \return NSERROR_OK on success or error code on faliure.
+ * \return NSERROR_OK on success or error code on failure.
*/
static nserror
parse_providers(char *providersd,
@@ -224,7 +224,7 @@ parse_providers(char *providersd,
* \param provider The provider to use.
* \param term The term being searched for.
* \param url_out The resulting url.
- * \return NSERROR_OK on sucess or appropriate error code.
+ * \return NSERROR_OK on success or appropriate error code.
*/
static nserror
make_search_nsurl(struct search_provider *provider,
@@ -289,7 +289,7 @@ search_web_ico_callback(hlcache_handle *ico,
switch (event->type) {
case CONTENT_MSG_DONE:
- LOG("icon '%s' retrived",
nsurl_access(hlcache_handle_get_url(ico)));
+ LOG("icon '%s' retrieved",
nsurl_access(hlcache_handle_get_url(ico)));
guit->search_web->provider_update(provider->name,
content_get_bitmap(ico));
break;
@@ -399,7 +399,7 @@ nserror search_web_select_provider(int selection)
guit->search_web->provider_update(provider->name, ico_bitmap);
- /* if the providers icon has not been retrived get it now */
+ /* if the providers icon has not been retrieved get it now */
if (provider->ico_handle == NULL) {
nsurl *icon_nsurl;
nserror ret;
@@ -438,7 +438,7 @@ default_ico_callback(hlcache_handle *ico,
switch (event->type) {
case CONTENT_MSG_DONE:
- LOG("default icon '%s' retrived",
nsurl_access(hlcache_handle_get_url(ico)));
+ LOG("default icon '%s' retrieved",
nsurl_access(hlcache_handle_get_url(ico)));
/* only set to default icon if providers icon has no handle */
if (ctx->providers[search_web_ctx.current].ico_handle == NULL) {
diff --git a/frontends/riscos/gui/url_bar.c b/frontends/riscos/gui/url_bar.c
index 30a72db..40c5c6f 100644
--- a/frontends/riscos/gui/url_bar.c
+++ b/frontends/riscos/gui/url_bar.c
@@ -21,7 +21,7 @@
* \file
* RISC OS URL bar implementation.
*
- * The treeview resources are retrived from resource url necessitating
+ * The treeview resources are retrieved from resource url necessitating
* the use of the hlcache content interface.
*/
@@ -966,7 +966,7 @@ void ro_gui_url_bar_set_url(struct url_bar *url_bar, const
char *url,
return;
/* Before we do anything with the URL, get it into local encoding so
- * that behaviour is consistant with the rest of the URL Bar module
+ * that behaviour is consistent with the rest of the URL Bar module
* (which will act on the icon's text buffer, which is always in local
* encoding).
*/
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=f679a9b1d6b652e06c24d543c7c5921753e3071b
commit f679a9b1d6b652e06c24d543c7c5921753e3071b
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
fix spelling and doxygen comments in image cache
diff --git a/content/handlers/image/image_cache.c
b/content/handlers/image/image_cache.c
index 3eb27ac..9c7ce22 100644
--- a/content/handlers/image/image_cache.c
+++ b/content/handlers/image/image_cache.c
@@ -16,6 +16,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+/**
+ * \file
+ * Cache implementation for bitmap images decoded into frontend format.
+ */
+
#include <assert.h>
#include <inttypes.h>
#include <stdint.h>
@@ -34,22 +39,26 @@
#include "image/image_cache.h"
#include "image/image.h"
-/** Age of an entry within the cache
+/**
+ * Age of an entry within the cache
*
* type deffed away so it can be readily changed later perhaps to a
* wallclock time structure.
*/
typedef unsigned int cache_age;
-/** Image cache entry
+/**
+ * Image cache entry
*/
struct image_cache_entry_s {
- struct image_cache_entry_s *next; /* next cache entry in list */
- struct image_cache_entry_s *prev; /* previous cache entry in list */
-
- struct content *content; /** content is used as a key */
- struct bitmap *bitmap; /** associated bitmap entry */
- /** Conversion routine */
+ struct image_cache_entry_s *next; /**< next cache entry in list */
+ struct image_cache_entry_s *prev; /**< previous cache entry in list */
+
+ /** content is used as a key */
+ struct content *content;
+ /** associated bitmap entry */
+ struct bitmap *bitmap;
+ /** routine to convert content into bitmap */
image_cache_convert_fn *convert;
/* Statistics for replacement algorithm */
@@ -62,7 +71,8 @@ struct image_cache_entry_s {
int conversion_count; /**< Number of times image has been converted */
};
-/** Current state of the cache.
+/**
+ * Current state of the cache.
*
* Global state of the cache. entries "age" is determined based on a
* monotonically incrementing operation count. This avoids issues with
@@ -90,12 +100,12 @@ struct image_cache_s {
/** Maximum size of bitmaps allocated at any one time */
size_t max_bitmap_size;
- /** The number of objects when maximum bitmap usage occoured */
+ /** The number of objects when maximum bitmap usage occurred */
int max_bitmap_size_count;
/** Maximum count of bitmaps allocated at any one time */
int max_bitmap_count;
- /** The size of the bitmaps when the max count occoured */
+ /** The size of the bitmaps when the max count occurred */
size_t max_bitmap_count_size;
/** Bitmap was not available at plot time required conversion */
@@ -130,7 +140,11 @@ struct image_cache_s {
static struct image_cache_s *image_cache = NULL;
-/** Find the nth cache entry
+/**
+ * Find a cache entry by index.
+ *
+ * \param entryn index of cache entry
+ * \return cache entry at index or NULL if not found.
*/
static struct image_cache_entry_s *image_cache__findn(int entryn)
{
@@ -144,7 +158,12 @@ static struct image_cache_entry_s *image_cache__findn(int
entryn)
return found;
}
-/** Find the cache entry for a content
+
+/**
+ * Find the cache entry for a content
+ *
+ * \param c The content to get an entry for
+ * \return The image cache entry or NULL if not found.
*/
static struct image_cache_entry_s *image_cache__find(const struct content *c)
{
@@ -157,6 +176,11 @@ static struct image_cache_entry_s *image_cache__find(const
struct content *c)
return found;
}
+/**
+ * Update the image cache statistics with an entry.
+ *
+ * \param centry The image cache entry to update the stats with.
+ */
static void image_cache_stats_bitmap_add(struct image_cache_entry_s *centry)
{
centry->bitmap_age = image_cache->current_age;
@@ -223,11 +247,20 @@ static void image_cache__unlink(struct
image_cache_entry_s *centry)
}
}
+/**
+ * free bitmap from an image cache entry
+ *
+ * \param centry The image cache entry to free bitmap from.
+ */
static void image_cache__free_bitmap(struct image_cache_entry_s *centry)
{
if (centry->bitmap != NULL) {
#ifdef IMAGE_CACHE_VERBOSE
- LOG("Freeing bitmap %p size %d age %d redraw count %d",
centry->bitmap, centry->bitmap_size, image_cache->current_age -
centry->bitmap_age, centry->redraw_count);
+ LOG("Freeing bitmap %p size %d age %d redraw count %d",
+ centry->bitmap,
+ centry->bitmap_size,
+ image_cache->current_age - centry->bitmap_age,
+ centry->redraw_count);
#endif
guit->bitmap->destroy(centry->bitmap);
centry->bitmap = NULL;
@@ -240,7 +273,11 @@ static void image_cache__free_bitmap(struct
image_cache_entry_s *centry)
}
-/* free cache entry */
+/**
+ * free image cache entry
+ *
+ * \param centry The image cache entry to free.
+ */
static void image_cache__free_entry(struct image_cache_entry_s *centry)
{
#ifdef IMAGE_CACHE_VERBOSE
@@ -258,7 +295,11 @@ static void image_cache__free_entry(struct
image_cache_entry_s *centry)
free(centry);
}
-/** Cache cleaner */
+/**
+ * Image cache cleaner
+ *
+ * \param icache The image cache context.
+ */
static void image_cache__clean(struct image_cache_s *icache)
{
struct image_cache_entry_s *centry = icache->entries;
@@ -277,7 +318,11 @@ static void image_cache__clean(struct image_cache_s
*icache)
}
}
-/** Cache background scheduled callback. */
+/**
+ * Cache background scheduled callback.
+ *
+ * \param p The image cache context.
+ */
static void image_cache__background_update(void *p)
{
struct image_cache_s *icache = p;
@@ -377,7 +422,7 @@ image_cache_init(const struct image_cache_parameters
*image_cache_parameters)
image_cache__background_update,
image_cache);
- LOG("Image cache initilised with a limit of %" PRIsizet " hysteresis of
%"PRIsizet,
+ LOG("Image cache initialised with a limit of %" PRIsizet " hysteresis
of %"PRIsizet,
image_cache->params.limit, image_cache->params.hysteresis);
return NSERROR_OK;
@@ -678,7 +723,7 @@ int image_cache_snentryf(char *string, size_t size,
unsigned int entryn,
case 'U':
slen += snprintf(string + slen, size - slen,
- "%s",
nsurl_access(llcache_handle_get_url(centry->content->llcache)));
+ "%s",
nsurl_access(llcache_handle_get_url(centry->content->llcache)));
break;
case 'o':
@@ -690,20 +735,20 @@ int image_cache_snentryf(char *string, size_t size,
unsigned int entryn,
centry->content->
llcache),
NSURL_HOST);
-
+
slen += snprintf(string + slen,
size - slen, "%s",
- lwc_string_data(
- origin));
+ lwc_string_data(
+ origin));
lwc_string_unref(origin);
} else {
slen += snprintf(string + slen,
size - slen, "%s",
- "localhost");
+ "localhost");
}
break;
-
+
case 's':
if (centry->bitmap != NULL) {
slen += snprintf(string + slen,
@@ -774,6 +819,7 @@ bool image_cache_redraw(struct content *c,
return image_bitmap_plot(centry->bitmap, data, clip, ctx);
}
+/* exported interface documented in image_cache.h */
void image_cache_destroy(struct content *content)
{
struct image_cache_entry_s *centry;
@@ -787,11 +833,13 @@ void image_cache_destroy(struct content *content)
}
}
+/* exported interface documented in image_cache.h */
void *image_cache_get_internal(const struct content *c, void *context)
{
return image_cache_get_bitmap(c);
}
+/* exported interface documented in image_cache.h */
content_type image_cache_content_type(void)
{
return CONTENT_IMAGE;
-----------------------------------------------------------------------
Summary of changes:
content/backing_store.h | 22 ++++----
content/handlers/css/hints.h | 4 +-
content/handlers/image/image_cache.c | 96 +++++++++++++++++++++++++---------
desktop/searchweb.c | 12 ++---
frontends/riscos/gui/url_bar.c | 4 +-
5 files changed, 93 insertions(+), 45 deletions(-)
diff --git a/content/backing_store.h b/content/backing_store.h
index 4e29511..3a1ae8f 100644
--- a/content/backing_store.h
+++ b/content/backing_store.h
@@ -38,7 +38,7 @@ enum backing_store_flags {
* low level cache backing store operation table
*
* The low level cache (source objects) has the capability to make
- * objects and their metadata (headers etc) persistant by writing to a
+ * objects and their metadata (headers etc) persistent by writing to a
* backing store using these operations.
*/
struct gui_llcache_table {
@@ -46,14 +46,14 @@ struct gui_llcache_table {
* Initialise the backing store.
*
* @param parameters to configure backing store.
- * @return NSERROR_OK on success or error code on faliure.
+ * @return NSERROR_OK on success or error code on failure.
*/
nserror (*initialise)(const struct llcache_store_parameters
*parameters);
/**
* Finalise the backing store.
*
- * @return NSERROR_OK on success or error code on faliure.
+ * @return NSERROR_OK on success or error code on failure.
*/
nserror (*finalise)(void);
@@ -72,16 +72,16 @@ struct gui_llcache_table {
* been completely written on return.
*
* @param[in] url The url is used as the unique primary key for the
data.
- * @param[in] flags The flags to control how the obejct is stored.
+ * @param[in] flags The flags to control how the object is stored.
* @param[in] data The objects data.
* @param[in] datalen The length of the \a data.
- * @return NSERROR_OK on success or error code on faliure.
+ * @return NSERROR_OK on success or error code on failure.
*/
nserror (*store)(struct nsurl *url, enum backing_store_flags flags,
uint8_t *data, const size_t datalen);
/**
- * Retrive an object from the backing store.
+ * Retrieve an object from the backing store.
*
* The backing store will manage its own memory and the
* allocations returned in \a data *must* not be altered.
@@ -91,10 +91,10 @@ struct gui_llcache_table {
* calling the release method.
*
* @param[in] url The url is used as the unique primary key for the
data.
- * @param[in] flags The flags to control how the object is retrived.
- * @param[out] data The retrived objects data.
+ * @param[in] flags The flags to control how the object is retrieved.
+ * @param[out] data The retrieved objects data.
* @param[out] datalen The length of the \a data retrieved.
- * @return NSERROR_OK on success or error code on faliure.
+ * @return NSERROR_OK on success or error code on failure.
*/
nserror (*fetch)(struct nsurl *url, enum backing_store_flags flags,
uint8_t **data, size_t *datalen);
@@ -104,7 +104,7 @@ struct gui_llcache_table {
*
* @param url The url is used as the unique primary key to invalidate.
* @param[in] flags The flags to control how the object data is
released.
- * @return NSERROR_OK on success or error code on faliure.
+ * @return NSERROR_OK on success or error code on failure.
*/
nserror (*release)(struct nsurl *url, enum backing_store_flags flags);
@@ -117,7 +117,7 @@ struct gui_llcache_table {
* If the entry had data allocated it will be released.
*
* @param url The url is used as the unique primary key to invalidate.
- * @return NSERROR_OK on success or error code on faliure.
+ * @return NSERROR_OK on success or error code on failure.
*/
nserror (*invalidate)(struct nsurl *url);
diff --git a/content/handlers/css/hints.h b/content/handlers/css/hints.h
index 2c18359..3d44d21 100644
--- a/content/handlers/css/hints.h
+++ b/content/handlers/css/hints.h
@@ -31,8 +31,8 @@ void css_hint_fini(void);
*
* \param[in] pw HTML document
* \param[in] node DOM node
- * \param[out] nhints number of hints retrived
- * \param[out] hints retrived hints
+ * \param[out] nhints number of hints retrieved
+ * \param[out] hints retrieved hints
* \return CSS_OK on success,
* CSS_PROPERTY_NOT_SET if there is no hint for the requested property,
* CSS_NOMEM on memory exhaustion.
diff --git a/content/handlers/image/image_cache.c
b/content/handlers/image/image_cache.c
index 3eb27ac..9c7ce22 100644
--- a/content/handlers/image/image_cache.c
+++ b/content/handlers/image/image_cache.c
@@ -16,6 +16,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+/**
+ * \file
+ * Cache implementation for bitmap images decoded into frontend format.
+ */
+
#include <assert.h>
#include <inttypes.h>
#include <stdint.h>
@@ -34,22 +39,26 @@
#include "image/image_cache.h"
#include "image/image.h"
-/** Age of an entry within the cache
+/**
+ * Age of an entry within the cache
*
* type deffed away so it can be readily changed later perhaps to a
* wallclock time structure.
*/
typedef unsigned int cache_age;
-/** Image cache entry
+/**
+ * Image cache entry
*/
struct image_cache_entry_s {
- struct image_cache_entry_s *next; /* next cache entry in list */
- struct image_cache_entry_s *prev; /* previous cache entry in list */
-
- struct content *content; /** content is used as a key */
- struct bitmap *bitmap; /** associated bitmap entry */
- /** Conversion routine */
+ struct image_cache_entry_s *next; /**< next cache entry in list */
+ struct image_cache_entry_s *prev; /**< previous cache entry in list */
+
+ /** content is used as a key */
+ struct content *content;
+ /** associated bitmap entry */
+ struct bitmap *bitmap;
+ /** routine to convert content into bitmap */
image_cache_convert_fn *convert;
/* Statistics for replacement algorithm */
@@ -62,7 +71,8 @@ struct image_cache_entry_s {
int conversion_count; /**< Number of times image has been converted */
};
-/** Current state of the cache.
+/**
+ * Current state of the cache.
*
* Global state of the cache. entries "age" is determined based on a
* monotonically incrementing operation count. This avoids issues with
@@ -90,12 +100,12 @@ struct image_cache_s {
/** Maximum size of bitmaps allocated at any one time */
size_t max_bitmap_size;
- /** The number of objects when maximum bitmap usage occoured */
+ /** The number of objects when maximum bitmap usage occurred */
int max_bitmap_size_count;
/** Maximum count of bitmaps allocated at any one time */
int max_bitmap_count;
- /** The size of the bitmaps when the max count occoured */
+ /** The size of the bitmaps when the max count occurred */
size_t max_bitmap_count_size;
/** Bitmap was not available at plot time required conversion */
@@ -130,7 +140,11 @@ struct image_cache_s {
static struct image_cache_s *image_cache = NULL;
-/** Find the nth cache entry
+/**
+ * Find a cache entry by index.
+ *
+ * \param entryn index of cache entry
+ * \return cache entry at index or NULL if not found.
*/
static struct image_cache_entry_s *image_cache__findn(int entryn)
{
@@ -144,7 +158,12 @@ static struct image_cache_entry_s *image_cache__findn(int
entryn)
return found;
}
-/** Find the cache entry for a content
+
+/**
+ * Find the cache entry for a content
+ *
+ * \param c The content to get an entry for
+ * \return The image cache entry or NULL if not found.
*/
static struct image_cache_entry_s *image_cache__find(const struct content *c)
{
@@ -157,6 +176,11 @@ static struct image_cache_entry_s *image_cache__find(const
struct content *c)
return found;
}
+/**
+ * Update the image cache statistics with an entry.
+ *
+ * \param centry The image cache entry to update the stats with.
+ */
static void image_cache_stats_bitmap_add(struct image_cache_entry_s *centry)
{
centry->bitmap_age = image_cache->current_age;
@@ -223,11 +247,20 @@ static void image_cache__unlink(struct
image_cache_entry_s *centry)
}
}
+/**
+ * free bitmap from an image cache entry
+ *
+ * \param centry The image cache entry to free bitmap from.
+ */
static void image_cache__free_bitmap(struct image_cache_entry_s *centry)
{
if (centry->bitmap != NULL) {
#ifdef IMAGE_CACHE_VERBOSE
- LOG("Freeing bitmap %p size %d age %d redraw count %d",
centry->bitmap, centry->bitmap_size, image_cache->current_age -
centry->bitmap_age, centry->redraw_count);
+ LOG("Freeing bitmap %p size %d age %d redraw count %d",
+ centry->bitmap,
+ centry->bitmap_size,
+ image_cache->current_age - centry->bitmap_age,
+ centry->redraw_count);
#endif
guit->bitmap->destroy(centry->bitmap);
centry->bitmap = NULL;
@@ -240,7 +273,11 @@ static void image_cache__free_bitmap(struct
image_cache_entry_s *centry)
}
-/* free cache entry */
+/**
+ * free image cache entry
+ *
+ * \param centry The image cache entry to free.
+ */
static void image_cache__free_entry(struct image_cache_entry_s *centry)
{
#ifdef IMAGE_CACHE_VERBOSE
@@ -258,7 +295,11 @@ static void image_cache__free_entry(struct
image_cache_entry_s *centry)
free(centry);
}
-/** Cache cleaner */
+/**
+ * Image cache cleaner
+ *
+ * \param icache The image cache context.
+ */
static void image_cache__clean(struct image_cache_s *icache)
{
struct image_cache_entry_s *centry = icache->entries;
@@ -277,7 +318,11 @@ static void image_cache__clean(struct image_cache_s
*icache)
}
}
-/** Cache background scheduled callback. */
+/**
+ * Cache background scheduled callback.
+ *
+ * \param p The image cache context.
+ */
static void image_cache__background_update(void *p)
{
struct image_cache_s *icache = p;
@@ -377,7 +422,7 @@ image_cache_init(const struct image_cache_parameters
*image_cache_parameters)
image_cache__background_update,
image_cache);
- LOG("Image cache initilised with a limit of %" PRIsizet " hysteresis of
%"PRIsizet,
+ LOG("Image cache initialised with a limit of %" PRIsizet " hysteresis
of %"PRIsizet,
image_cache->params.limit, image_cache->params.hysteresis);
return NSERROR_OK;
@@ -678,7 +723,7 @@ int image_cache_snentryf(char *string, size_t size,
unsigned int entryn,
case 'U':
slen += snprintf(string + slen, size - slen,
- "%s",
nsurl_access(llcache_handle_get_url(centry->content->llcache)));
+ "%s",
nsurl_access(llcache_handle_get_url(centry->content->llcache)));
break;
case 'o':
@@ -690,20 +735,20 @@ int image_cache_snentryf(char *string, size_t size,
unsigned int entryn,
centry->content->
llcache),
NSURL_HOST);
-
+
slen += snprintf(string + slen,
size - slen, "%s",
- lwc_string_data(
- origin));
+ lwc_string_data(
+ origin));
lwc_string_unref(origin);
} else {
slen += snprintf(string + slen,
size - slen, "%s",
- "localhost");
+ "localhost");
}
break;
-
+
case 's':
if (centry->bitmap != NULL) {
slen += snprintf(string + slen,
@@ -774,6 +819,7 @@ bool image_cache_redraw(struct content *c,
return image_bitmap_plot(centry->bitmap, data, clip, ctx);
}
+/* exported interface documented in image_cache.h */
void image_cache_destroy(struct content *content)
{
struct image_cache_entry_s *centry;
@@ -787,11 +833,13 @@ void image_cache_destroy(struct content *content)
}
}
+/* exported interface documented in image_cache.h */
void *image_cache_get_internal(const struct content *c, void *context)
{
return image_cache_get_bitmap(c);
}
+/* exported interface documented in image_cache.h */
content_type image_cache_content_type(void)
{
return CONTENT_IMAGE;
diff --git a/desktop/searchweb.c b/desktop/searchweb.c
index 593591c..29a998e 100644
--- a/desktop/searchweb.c
+++ b/desktop/searchweb.c
@@ -60,7 +60,7 @@ static const char *default_search_icon_url =
"resource:icons/search.png";
/**
* Read providers file.
*
- * Allocates stoage of sufficient size for the providers file and
+ * Allocates storage of sufficient size for the providers file and
* reads the entire file in.
*
* \param fname The filename to read.
@@ -132,7 +132,7 @@ read_providers(const char *fname,
* \param providers_size The size of the provider data.
* \param providers_out The resulting provider array.
* \param providers_count The number of providers in the output array.
- * \return NSERROR_OK on success or error code on faliure.
+ * \return NSERROR_OK on success or error code on failure.
*/
static nserror
parse_providers(char *providersd,
@@ -224,7 +224,7 @@ parse_providers(char *providersd,
* \param provider The provider to use.
* \param term The term being searched for.
* \param url_out The resulting url.
- * \return NSERROR_OK on sucess or appropriate error code.
+ * \return NSERROR_OK on success or appropriate error code.
*/
static nserror
make_search_nsurl(struct search_provider *provider,
@@ -289,7 +289,7 @@ search_web_ico_callback(hlcache_handle *ico,
switch (event->type) {
case CONTENT_MSG_DONE:
- LOG("icon '%s' retrived",
nsurl_access(hlcache_handle_get_url(ico)));
+ LOG("icon '%s' retrieved",
nsurl_access(hlcache_handle_get_url(ico)));
guit->search_web->provider_update(provider->name,
content_get_bitmap(ico));
break;
@@ -399,7 +399,7 @@ nserror search_web_select_provider(int selection)
guit->search_web->provider_update(provider->name, ico_bitmap);
- /* if the providers icon has not been retrived get it now */
+ /* if the providers icon has not been retrieved get it now */
if (provider->ico_handle == NULL) {
nsurl *icon_nsurl;
nserror ret;
@@ -438,7 +438,7 @@ default_ico_callback(hlcache_handle *ico,
switch (event->type) {
case CONTENT_MSG_DONE:
- LOG("default icon '%s' retrived",
nsurl_access(hlcache_handle_get_url(ico)));
+ LOG("default icon '%s' retrieved",
nsurl_access(hlcache_handle_get_url(ico)));
/* only set to default icon if providers icon has no handle */
if (ctx->providers[search_web_ctx.current].ico_handle == NULL) {
diff --git a/frontends/riscos/gui/url_bar.c b/frontends/riscos/gui/url_bar.c
index 30a72db..40c5c6f 100644
--- a/frontends/riscos/gui/url_bar.c
+++ b/frontends/riscos/gui/url_bar.c
@@ -21,7 +21,7 @@
* \file
* RISC OS URL bar implementation.
*
- * The treeview resources are retrived from resource url necessitating
+ * The treeview resources are retrieved from resource url necessitating
* the use of the hlcache content interface.
*/
@@ -966,7 +966,7 @@ void ro_gui_url_bar_set_url(struct url_bar *url_bar, const
char *url,
return;
/* Before we do anything with the URL, get it into local encoding so
- * that behaviour is consistant with the rest of the URL Bar module
+ * that behaviour is consistent with the rest of the URL Bar module
* (which will act on the icon's text buffer, which is always in local
* encoding).
*/
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
