From 14c13854d3cae9d93c3d148be30fb72f1eaffe55 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Mon, 18 Mar 2024 18:56:33 +0000 Subject: [Rework] Further types conversion (no functional changes) --- src/libutil/mem_pool_internal.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/libutil/mem_pool_internal.h') diff --git a/src/libutil/mem_pool_internal.h b/src/libutil/mem_pool_internal.h index 9fff5c7de..26a687b6c 100644 --- a/src/libutil/mem_pool_internal.h +++ b/src/libutil/mem_pool_internal.h @@ -1,11 +1,11 @@ -/*- - * Copyright 2019 Vsevolod Stakhov +/* + * Copyright 2024 Vsevolod Stakhov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -22,7 +22,7 @@ */ #define align_ptr(p, a) \ - ((guint8 *) ((uintptr_t) (p) + ((-(intptr_t) (p)) & ((a) -1)))) + ((uint8_t *) ((uintptr_t) (p) + ((-(intptr_t) (p)) & ((a) -1)))) enum rspamd_mempool_chain_type { RSPAMD_MEMPOOL_NORMAL = 0, @@ -38,7 +38,7 @@ struct entry_elt { }; struct rspamd_mempool_entry_point { - gchar src[ENTRY_LEN]; + char src[ENTRY_LEN]; uint32_t cur_suggestion; uint32_t cur_elts; uint32_t cur_vars; @@ -51,8 +51,8 @@ struct rspamd_mempool_entry_point { struct _pool_destructors { rspamd_mempool_destruct_t func; /**< pointer to destructor */ void *data; /**< data to free */ - const gchar *function; /**< function from which this destructor was added */ - const gchar *loc; /**< line number */ + const char *function; /**< function from which this destructor was added */ + const char *loc; /**< line number */ struct _pool_destructors *next; }; @@ -74,16 +74,16 @@ struct rspamd_mempool_specific { struct rspamd_mempool_entry_point *entry; gsize elt_len; /**< size of an element */ gsize used_memory; - guint wasted_memory; - gint flags; + unsigned int wasted_memory; + int flags; }; /** * Pool page structure */ struct _pool_chain { - guint8 *begin; /**< begin of pool chain block */ - guint8 *pos; /**< current start of free space in block */ + uint8_t *begin; /**< begin of pool chain block */ + uint8_t *pos; /**< current start of free space in block */ gsize slice_size; /**< length of block */ struct _pool_chain *next; }; -- cgit v1.2.3