osmocom
/
libosmocore
mirror of https://gerrit.osmocom.org/libosmocore
11
0
Fork 0
Code Issues Releases Wiki Activity

msgfile: use namespace prefix osmo_* and use more descriptive names 

Summary of changes:

s/msg_entry/osmo_config_entry/g
s/msg_entries/osmo_config_list/g
s/msg_entry_parse/osmo_config_list_parse/g

minor glitch included in this patch while I was at it:

-#include "linuxlist.h"
+#include <osmocom/core/linuxlist.h>
This commit is contained in:
Pablo Neira Ayuso 2011-05-07 13:01:41 +02:00
parent 2c34867fc3
commit 1b4a42c3b1
3 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/osmocom/core/msgfile.h
View File

@ -22,12 +22,12 @@
#ifndef MSG_FILE_H
#define MSG_FILE_H
#include "linuxlist.h"
#include <osmocom/core/linuxlist.h>
/**
* One message in the list.
*/
struct msg_entry {
struct osmo_config_entry {
struct llist_head list;
/* number for everyone to use */
@ -40,10 +40,10 @@ struct msg_entry {
char *text;
};
struct msg_entries {
struct osmo_config_list {
struct llist_head entry;
};
struct msg_entries *msg_entry_parse(void *ctx, const char *filename);
struct osmo_config_list* osmo_config_list_parse(void *ctx, const char *filename);
#endif

22
src/msgfile.c
View File

@ -29,11 +29,13 @@
#include <unistd.h>
#include <string.h>
static struct msg_entry *alloc_entry(struct msg_entries *entries,
const char *mcc, const char *mnc,
const char *option, const char *text)
static struct osmo_config_entry *
alloc_entry(struct osmo_config_list *entries,
const char *mcc, const char *mnc,
const char *option, const char *text)
{
struct msg_entry *entry = talloc_zero(entries, struct msg_entry);
struct osmo_config_entry *entry =
talloc_zero(entries, struct osmo_config_entry);
if (!entry)
return NULL;
@ -46,11 +48,11 @@ static struct msg_entry *alloc_entry(struct msg_entries *entries,
return entry;
}
static struct msg_entries *alloc_entries(void *ctx)
static struct osmo_config_list *alloc_entries(void *ctx)
{
struct msg_entries *entries;
struct osmo_config_list *entries;
entries = talloc_zero(ctx, struct msg_entries);
entries = talloc_zero(ctx, struct osmo_config_list);
if (!entries)
return NULL;
@ -61,7 +63,7 @@ static struct msg_entries *alloc_entries(void *ctx)
/*
* split a line like 'foo:Text'.
*/
static void handle_line(struct msg_entries *entries, char *line)
static void handle_line(struct osmo_config_list *entries, char *line)
{
int i;
const int len = strlen(line);
@ -91,9 +93,9 @@ static void handle_line(struct msg_entries *entries, char *line)
/* nothing found */
}
struct msg_entries *msg_entry_parse(void *ctx, const char *filename)
struct osmo_config_list *osmo_config_list_parse(void *ctx, const char *filename)
{
struct msg_entries *entries;
struct osmo_config_list *entries;
size_t n;
char *line;
FILE *file;

8
tests/msgfile/msgfile_test.c
View File

@ -23,9 +23,9 @@
#include <stdio.h>
static void dump_entries(struct msg_entries *entries)
static void dump_entries(struct osmo_config_list *entries)
{
struct msg_entry *entry;
struct osmo_config_entry *entry;
if (!entries) {
fprintf(stderr, "Failed to parse the file\n");
@ -40,10 +40,10 @@ static void dump_entries(struct msg_entries *entries)
int main(int argc, char **argv)
{
struct msg_entries *entries;
struct osmo_config_list *entries;
/* todo use msgfile_test.c.in and replace the path */
entries = msg_entry_parse(NULL, "msgconfig.cfg");
entries = osmo_config_list_parse(NULL, "msgconfig.cfg");
dump_entries(entries);
return 0;