devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 6 Actions Packages Projects 1 Releases Wiki Activity

refactor: make Resource use glib functions

Browse Source
This commit is contained in:
Michael Vetter
2026-02-26 17:40:57 +01:00
parent 8a36ca6d97
commit abffffb499
2 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/xmpp/resource.c
View File

@@ -39,18 +39,20 @@
#include <stdlib.h>
#include <string.h>
#include <glib.h>
#include "common.h"
#include "xmpp/resource.h"
Resource*
resource_new(const char* const name, resource_presence_t presence, const char* const status, const int priority)
resource_new(const gchar* const name, resource_presence_t presence, const gchar* const status, const int priority)
{
assert(name != NULL);
Resource* new_resource = malloc(sizeof(struct resource_t));
new_resource->name = strdup(name);
Resource* new_resource = g_new(Resource, 1);
new_resource->name = g_strdup(name);
new_resource->presence = presence;
if (status) {
new_resource->status = strdup(status);
new_resource->status = g_strdup(status);
} else {
new_resource->status = NULL;
}
@@ -93,14 +95,14 @@ void
resource_destroy(Resource* resource)
{
if (resource) {
free(resource->name);
free(resource->status);
free(resource);
g_free(resource->name);
g_free(resource->status);
g_free(resource);
}
}
gboolean
valid_resource_presence_string(const char* const str)
valid_resource_presence_string(const gchar* const str)
{
assert(str != NULL);
if ((strcmp(str, "online") == 0) || (strcmp(str, "chat") == 0) || (strcmp(str, "away") == 0) || (strcmp(str, "xa") == 0) || (strcmp(str, "dnd") == 0)) {
@@ -110,7 +112,7 @@ valid_resource_presence_string(const char* const str)
}
}
const char*
const gchar*
string_from_resource_presence(resource_presence_t presence)
{
switch (presence) {
@@ -128,7 +130,7 @@ string_from_resource_presence(resource_presence_t presence)
}
resource_presence_t
resource_presence_from_string(const char* const str)
resource_presence_from_string(const gchar* const str)
{
if (str == NULL) {
return RESOURCE_ONLINE;

12
src/xmpp/resource.h
View File

@@ -40,20 +40,20 @@
typedef struct resource_t
{
char* name;
gchar* name;
resource_presence_t presence;
char* status;
gchar* status;
int priority;
} Resource;
Resource* resource_new(const char* const name, resource_presence_t presence, const char* const status,
Resource* resource_new(const gchar* const name, resource_presence_t presence, const gchar* const status,
const int priority);
void resource_destroy(Resource* resource);
int resource_compare_availability(Resource* first, Resource* second);
gboolean valid_resource_presence_string(const char* const str);
const char* string_from_resource_presence(resource_presence_t presence);
resource_presence_t resource_presence_from_string(const char* const str);
gboolean valid_resource_presence_string(const gchar* const str);
const gchar* string_from_resource_presence(resource_presence_t presence);
resource_presence_t resource_presence_from_string(const gchar* const str);
contact_presence_t contact_presence_from_resource_presence(resource_presence_t resource_presence);
#endif