projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lttng: make the configuration file interface const correct
[lttng-tools.git]
/
src
/
bin
/
lttng
/
conf.c
diff --git
a/src/bin/lttng/conf.c
b/src/bin/lttng/conf.c
index f96be3a8175a248e8c1e6187e8e5fc5e96c8b270..52979af0d1fb0df1f8f99409b954e15520091cf2 100644
(file)
--- a/
src/bin/lttng/conf.c
+++ b/
src/bin/lttng/conf.c
@@
-15,7
+15,6
@@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#define _GNU_SOURCE
#define _LGPL_SOURCE
#include <limits.h>
#include <stdio.h>
#define _LGPL_SOURCE
#include <limits.h>
#include <stdio.h>
@@
-35,7
+34,7
@@
* Returns the path with '/CONFIG_FILENAME' added to it;
* path will be NULL if an error occurs.
*/
* Returns the path with '/CONFIG_FILENAME' added to it;
* path will be NULL if an error occurs.
*/
-char *config_get_file_path(char *path)
+char *config_get_file_path(c
onst c
har *path)
{
int ret;
char *file_path;
{
int ret;
char *file_path;
@@
-53,7
+52,7
@@
char *config_get_file_path(char *path)
* Returns an open FILE pointer to the config file;
* on error, NULL is returned.
*/
* Returns an open FILE pointer to the config file;
* on error, NULL is returned.
*/
-static FILE *open_config(char *path, const char *mode)
+static FILE *open_config(c
onst c
har *path, const char *mode)
{
FILE *fp = NULL;
char *file_path;
{
FILE *fp = NULL;
char *file_path;
@@
-101,7
+100,7
@@
error:
* On success, returns 0;
* on error, returns -1.
*/
* On success, returns 0;
* on error, returns -1.
*/
-static int write_config(char *file_path, size_t size, char *data)
+static int write_config(c
onst c
har *file_path, size_t size, char *data)
{
FILE *fp;
size_t len;
{
FILE *fp;
size_t len;
@@
-128,7
+127,7
@@
end:
/*
* Destroys directory config and file config.
*/
/*
* Destroys directory config and file config.
*/
-void config_destroy(char *path)
+void config_destroy(c
onst c
har *path)
{
int ret;
char *config_path;
{
int ret;
char *config_path;
@@
-179,11
+178,12
@@
int config_exists(const char *path)
}
static
}
static
-int _config_read_session_name(char *path, char **name)
+int _config_read_session_name(c
onst c
har *path, char **name)
{
int ret = 0;
FILE *fp;
char var[NAME_MAX], *session_name;
{
int ret = 0;
FILE *fp;
char var[NAME_MAX], *session_name;
+
#if (NAME_MAX == 255)
#define NAME_MAX_SCANF_IS_A_BROKEN_API "254"
#endif
#if (NAME_MAX == 255)
#define NAME_MAX_SCANF_IS_A_BROKEN_API "254"
#endif
@@
-238,7
+238,7
@@
found:
* The caller is responsible for freeing the returned string.
* On error, NULL is returned.
*/
* The caller is responsible for freeing the returned string.
* On error, NULL is returned.
*/
-char *config_read_session_name(char *path)
+char *config_read_session_name(c
onst c
har *path)
{
int ret;
char *name = NULL;
{
int ret;
char *name = NULL;
@@
-260,7
+260,7
@@
char *config_read_session_name(char *path)
* The caller is responsible for freeing the returned string.
* On error, NULL is returned.
*/
* The caller is responsible for freeing the returned string.
* On error, NULL is returned.
*/
-char *config_read_session_name_quiet(char *path)
+char *config_read_session_name_quiet(c
onst c
har *path)
{
char *name = NULL;
{
char *name = NULL;
@@
-273,7
+273,7
@@
char *config_read_session_name_quiet(char *path)
* On success, returns 0;
* on error, returns -1.
*/
* On success, returns 0;
* on error, returns -1.
*/
-int config_add_session_name(c
har *path,
char *name)
+int config_add_session_name(c
onst char *path, const
char *name)
{
int ret;
char *attr = "session=";
{
int ret;
char *attr = "session=";
@@
-299,7
+299,7
@@
error:
* On success, returns 0;
* on error, returns -1.
*/
* On success, returns 0;
* on error, returns -1.
*/
-int config_init(char *session_name)
+int config_init(c
onst c
har *session_name)
{
int ret;
char *path;
{
int ret;
char *path;
This page took
0.035545 seconds
and
5
git commands to generate.