Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
NetworkManager-l2tp
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
CeRiAl
NetworkManager-l2tp
Commits
2af765c4
Commit
2af765c4
authored
Feb 28, 2012
by
Сергей Прохоров
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Properly set errors in import-export.
parent
19e9cb4b
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
7 deletions
+18
-7
import-export.c
properties/import-export.c
+18
-7
No files found.
properties/import-export.c
View file @
2af765c4
...
@@ -130,7 +130,9 @@ do_import (const char *path, GError **error)
...
@@ -130,7 +130,9 @@ do_import (const char *path, GError **error)
keyfile
=
g_key_file_new
();
keyfile
=
g_key_file_new
();
if
(
!
g_key_file_load_from_file
(
keyfile
,
path
,
0
,
error
))
{
if
(
!
g_key_file_load_from_file
(
keyfile
,
path
,
0
,
error
))
{
g_set_error
(
error
,
0
,
0
,
g_set_error
(
error
,
L2TP_PLUGIN_UI_ERROR
,
L2TP_PLUGIN_UI_ERROR_FILE_NOT_L2TP
,
_
(
"does not look like a L2TP VPN connection (parse failed)"
));
_
(
"does not look like a L2TP VPN connection (parse failed)"
));
return
NULL
;
return
NULL
;
}
}
...
@@ -158,7 +160,9 @@ do_import (const char *path, GError **error)
...
@@ -158,7 +160,9 @@ do_import (const char *path, GError **error)
if
(
!
prop
.
required
)
if
(
!
prop
.
required
)
continue
;
continue
;
g_set_error
(
error
,
0
,
0
,
g_set_error
(
error
,
L2TP_PLUGIN_UI_ERROR
,
L2TP_PLUGIN_UI_ERROR_MISSING_PROPERTY
,
_
(
"Required property %s missing"
),
_
(
"Required property %s missing"
),
prop
.
name
);
prop
.
name
);
g_key_file_free
(
keyfile
);
g_key_file_free
(
keyfile
);
...
@@ -173,7 +177,9 @@ do_import (const char *path, GError **error)
...
@@ -173,7 +177,9 @@ do_import (const char *path, GError **error)
case
G_TYPE_UINT
:
case
G_TYPE_UINT
:
int_val
=
g_key_file_get_integer
(
keyfile
,
VPN_SECTION
,
prop
.
name
,
error
);
int_val
=
g_key_file_get_integer
(
keyfile
,
VPN_SECTION
,
prop
.
name
,
error
);
if
(
int_val
==
0
&&
*
error
){
if
(
int_val
==
0
&&
*
error
){
g_set_error
(
error
,
0
,
0
,
g_set_error
(
error
,
L2TP_PLUGIN_UI_ERROR
,
L2TP_PLUGIN_UI_ERROR_INVALID_PROPERTY
,
_
(
"Property %s can't be parsed as integer."
),
_
(
"Property %s can't be parsed as integer."
),
prop
.
name
);
prop
.
name
);
g_key_file_free
(
keyfile
);
g_key_file_free
(
keyfile
);
...
@@ -187,7 +193,9 @@ do_import (const char *path, GError **error)
...
@@ -187,7 +193,9 @@ do_import (const char *path, GError **error)
if
(
!
bool_val
&&
!
(
*
error
))
if
(
!
bool_val
&&
!
(
*
error
))
continue
;
continue
;
if
(
!
bool_val
)
{
if
(
!
bool_val
)
{
g_set_error
(
error
,
0
,
0
,
g_set_error
(
error
,
L2TP_PLUGIN_UI_ERROR
,
L2TP_PLUGIN_UI_ERROR_INVALID_PROPERTY
,
_
(
"Property %s can't be parsed as boolean. Only 'true' and 'false' allowed."
),
_
(
"Property %s can't be parsed as boolean. Only 'true' and 'false' allowed."
),
prop
.
name
);
prop
.
name
);
g_key_file_free
(
keyfile
);
g_key_file_free
(
keyfile
);
...
@@ -247,8 +255,8 @@ do_export (const char *path, NMConnection *connection, GError **error)
...
@@ -247,8 +255,8 @@ do_export (const char *path, NMConnection *connection, GError **error)
if
(
!
value
&&
prop
.
required
){
if
(
!
value
&&
prop
.
required
){
g_key_file_free
(
export_file
);
g_key_file_free
(
export_file
);
g_set_error
(
error
,
g_set_error
(
error
,
0
,
L2TP_PLUGIN_UI_ERROR
,
0
,
L2TP_PLUGIN_UI_ERROR_MISSING_PROPERTY
,
_
(
"Missing required property '%s'"
),
_
(
"Missing required property '%s'"
),
prop
.
name
);
prop
.
name
);
return
FALSE
;
return
FALSE
;
...
@@ -274,7 +282,10 @@ do_export (const char *path, NMConnection *connection, GError **error)
...
@@ -274,7 +282,10 @@ do_export (const char *path, NMConnection *connection, GError **error)
}
}
if
(
!
(
file
=
fopen
(
path
,
"w"
)))
{
if
(
!
(
file
=
fopen
(
path
,
"w"
)))
{
g_warning
(
_
(
"Could not open file: %s"
),
path
);
g_set_error
(
error
,
L2TP_PLUGIN_UI_ERROR
,
L2TP_PLUGIN_UI_ERROR_FILE_NOT_READABLE
,
_
(
"Couldn't open file for writing."
));
g_key_file_free
(
export_file
);
g_key_file_free
(
export_file
);
return
FALSE
;
return
FALSE
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment