Skip to content

Commit

Permalink
Remove circular include.
Browse files Browse the repository at this point in the history
Reported by Peter Lemenkov (@lemenkov)

Addresses #1562

(cherry picked from commit b90a34c)
  • Loading branch information
bogdan-iancu committed Dec 11, 2018
1 parent eeb6b5b commit f71ddc2
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 29 deletions.
34 changes: 34 additions & 0 deletions dprint.c
Expand Up @@ -117,3 +117,37 @@ void reset_proc_log_level(void)
{
*log_level = *default_log_level;
}

/*
* set the (default) log level of a given process
*
* Note: the index param is not validated!
*/
void __set_proc_log_level(int proc_idx, int level)
{
pt[proc_idx].log_level = level;
}

void __set_proc_default_log_level(int proc_idx, int level)
{
pt[proc_idx].default_log_level = level;
}

/* set the current and default log levels for all OpenSIPS processes */
void set_global_log_level(int level)
{
int i;

for (i = 0; i < counted_processes; i++) {
__set_proc_default_log_level(i, level);
__set_proc_log_level(i, level);
}
}

/* set the log level of the current process */
void set_proc_log_level(int level)
{
__set_proc_log_level(process_no, level);
}


33 changes: 4 additions & 29 deletions dprint.h
Expand Up @@ -52,8 +52,6 @@
#include <syslog.h>
#include <time.h>

#include "pt.h"

#define L_ALERT -3 /*!< Alert level */
#define L_CRIT -2 /*!< Critical level */
#define L_ERR -1 /*!< Error level */
Expand Down Expand Up @@ -118,38 +116,15 @@ void dprint (char* format, ...);

int str2facility(char *s);

/*
* set the (default) log level of a given process
*
* Note: the index param is not validated!
*/
static inline void __set_proc_log_level(int proc_idx, int level)
{
pt[proc_idx].log_level = level;
}
void __set_proc_log_level(int proc_idx, int level);

static inline void __set_proc_default_log_level(int proc_idx, int level)
{
pt[proc_idx].default_log_level = level;
}
void __set_proc_default_log_level(int proc_idx, int level);

/* set the current and default log levels for all OpenSIPS processes */
static inline void set_global_log_level(int level)
{
int i;

for (i = 0; i < counted_processes; i++) {
__set_proc_default_log_level(i, level);
__set_proc_log_level(i, level);
}
}
void set_global_log_level(int level);

/* set the log level of the current process */
static inline void set_proc_log_level(int level)
{
__set_proc_log_level(process_no, level);
}

void set_proc_log_level(int level);

/* changes the logging level to the default value for the current process */
void reset_proc_log_level(void);
Expand Down

0 comments on commit f71ddc2

Please sign in to comment.