- new folder src/ to hold the source code for main project applications
- main.c is in src/
- all core files are subfolder are in src/core/
- modules are in src/modules/
- libs are in src/lib/
- application Makefiles are in src/
- application binary is built in src/ (src/kamailio)
1 | 1 |
deleted file mode 100644 |
... | ... |
@@ -1,49 +0,0 @@ |
1 |
-/* |
|
2 |
- * MySQL module row related functions |
|
3 |
- * |
|
4 |
- * Copyright (C) 2001-2003 FhG Fokus |
|
5 |
- * Copyright (C) 2008 1&1 Internet AG |
|
6 |
- * |
|
7 |
- * This file is part of Kamailio, a free SIP server. |
|
8 |
- * |
|
9 |
- * Kamailio is free software; you can redistribute it and/or modify |
|
10 |
- * it under the terms of the GNU General Public License as published by |
|
11 |
- * the Free Software Foundation; either version 2 of the License, or |
|
12 |
- * (at your option) any later version |
|
13 |
- * |
|
14 |
- * Kamailio is distributed in the hope that it will be useful, |
|
15 |
- * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
16 |
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
17 |
- * GNU General Public License for more details. |
|
18 |
- * |
|
19 |
- * You should have received a copy of the GNU General Public License |
|
20 |
- * along with this program; if not, write to the Free Software |
|
21 |
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
|
22 |
- */ |
|
23 |
- |
|
24 |
-/*! \file |
|
25 |
- * \brief DB_MYSQL :: Row related functions |
|
26 |
- * \ref row.c |
|
27 |
- * \ingroup db_mysql |
|
28 |
- * Module: \ref db_mysql |
|
29 |
- */ |
|
30 |
- |
|
31 |
- |
|
32 |
-#ifndef KM_ROW_H |
|
33 |
-#define KM_ROW_H |
|
34 |
- |
|
35 |
-#include "../../lib/srdb1/db_con.h" |
|
36 |
-#include "../../lib/srdb1/db_res.h" |
|
37 |
-#include "../../lib/srdb1/db_row.h" |
|
38 |
- |
|
39 |
- |
|
40 |
-/*! |
|
41 |
- * \brief Convert a row from result into DB API representation |
|
42 |
- * \param _h database connection |
|
43 |
- * \param _res database result in the DB API representation |
|
44 |
- * \param _r database result row |
|
45 |
- * \return 0 on success, -1 on failure |
|
46 |
- */ |
|
47 |
-int db_mysql_convert_row(const db1_con_t* _h, db1_res_t* _res, db_row_t* _r); |
|
48 |
- |
|
49 |
-#endif |
... | ... |
@@ -20,7 +20,7 @@ |
20 | 20 |
* |
21 | 21 |
* You should have received a copy of the GNU General Public License |
22 | 22 |
* along with this program; if not, write to the Free Software |
23 |
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
|
23 |
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
|
24 | 24 |
*/ |
25 | 25 |
|
26 | 26 |
/*! \file |
The structure db_res has been renamed in lib/srdb1 to db1_res, thus we need to
change the name of the structure in all files originating from
kamailio/modules/db_mysql (and using lib/srdb1).
The structure db_con has been renamed in lib/srdb1 to db1_con, thus we
need to change the name of the structure in all files originating from
kamailio/modules/db_mysql (and using lib/srdb1).
* Defines protecting header files from double inclusion fixed to match
filenames.
* Linked the module also with srdb1
* Fixed path to header files in lib/srdb1.
* Filenames of local included header files prefixed with km_ to match
their real filenames
... | ... |
@@ -31,12 +31,12 @@ |
31 | 31 |
*/ |
32 | 32 |
|
33 | 33 |
|
34 |
-#ifndef ROW_H |
|
35 |
-#define ROW_H |
|
34 |
+#ifndef KM_ROW_H |
|
35 |
+#define KM_ROW_H |
|
36 | 36 |
|
37 |
-#include "../../db/db_con.h" |
|
38 |
-#include "../../db/db_res.h" |
|
39 |
-#include "../../db/db_row.h" |
|
37 |
+#include "../../lib/srdb1/db_con.h" |
|
38 |
+#include "../../lib/srdb1/db_res.h" |
|
39 |
+#include "../../lib/srdb1/db_row.h" |
|
40 | 40 |
|
41 | 41 |
|
42 | 42 |
/*! |
git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5254 689a6050-402a-0410-94f2-e92a70836424
... | ... |
@@ -39,9 +39,13 @@ |
39 | 39 |
#include "../../db/db_row.h" |
40 | 40 |
|
41 | 41 |
|
42 |
-/** |
|
43 |
- * Convert a row from result into db API representation |
|
42 |
+/*! |
|
43 |
+ * \brief Convert a row from result into DB API representation |
|
44 |
+ * \param _h database connection |
|
45 |
+ * \param _res database result in the DB API representation |
|
46 |
+ * \param _r database result row |
|
47 |
+ * \return 0 on success, -1 on failure |
|
44 | 48 |
*/ |
45 | 49 |
int db_mysql_convert_row(const db_con_t* _h, db_res_t* _res, db_row_t* _r); |
46 | 50 |
|
47 |
-#endif /* ROW_H */ |
|
51 |
+#endif |
git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4518 689a6050-402a-0410-94f2-e92a70836424
... | ... |
@@ -6,14 +6,14 @@ |
6 | 6 |
* Copyright (C) 2001-2003 FhG Fokus |
7 | 7 |
* Copyright (C) 2008 1&1 Internet AG |
8 | 8 |
* |
9 |
- * This file is part of openser, a free SIP server. |
|
9 |
+ * This file is part of Kamailio, a free SIP server. |
|
10 | 10 |
* |
11 |
- * openser is free software; you can redistribute it and/or modify |
|
11 |
+ * Kamailio is free software; you can redistribute it and/or modify |
|
12 | 12 |
* it under the terms of the GNU General Public License as published by |
13 | 13 |
* the Free Software Foundation; either version 2 of the License, or |
14 | 14 |
* (at your option) any later version |
15 | 15 |
* |
16 |
- * openser is distributed in the hope that it will be useful, |
|
16 |
+ * Kamailio is distributed in the hope that it will be useful, |
|
17 | 17 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
18 | 18 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
19 | 19 |
* GNU General Public License for more details. |
git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4505 689a6050-402a-0410-94f2-e92a70836424
... | ... |
@@ -23,6 +23,14 @@ |
23 | 23 |
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
24 | 24 |
*/ |
25 | 25 |
|
26 |
+/*! \file |
|
27 |
+ * \brief DB_MYSQL :: Row related functions |
|
28 |
+ * \ref row.c |
|
29 |
+ * \ingroup db_mysql |
|
30 |
+ * Module: \ref db_mysql |
|
31 |
+ */ |
|
32 |
+ |
|
33 |
+ |
|
26 | 34 |
#ifndef ROW_H |
27 | 35 |
#define ROW_H |
28 | 36 |
|
git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4124 689a6050-402a-0410-94f2-e92a70836424
git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3638 689a6050-402a-0410-94f2-e92a70836424
1 | 1 |
new file mode 100644 |
... | ... |
@@ -0,0 +1,39 @@ |
1 |
+/* |
|
2 |
+ * $Id$ |
|
3 |
+ * |
|
4 |
+ * MySQL module row related functions |
|
5 |
+ * |
|
6 |
+ * Copyright (C) 2001-2003 FhG Fokus |
|
7 |
+ * Copyright (C) 2008 1&1 Internet AG |
|
8 |
+ * |
|
9 |
+ * This file is part of openser, a free SIP server. |
|
10 |
+ * |
|
11 |
+ * openser is free software; you can redistribute it and/or modify |
|
12 |
+ * it under the terms of the GNU General Public License as published by |
|
13 |
+ * the Free Software Foundation; either version 2 of the License, or |
|
14 |
+ * (at your option) any later version |
|
15 |
+ * |
|
16 |
+ * openser is distributed in the hope that it will be useful, |
|
17 |
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
18 |
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
19 |
+ * GNU General Public License for more details. |
|
20 |
+ * |
|
21 |
+ * You should have received a copy of the GNU General Public License |
|
22 |
+ * along with this program; if not, write to the Free Software |
|
23 |
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
|
24 |
+ */ |
|
25 |
+ |
|
26 |
+#ifndef ROW_H |
|
27 |
+#define ROW_H |
|
28 |
+ |
|
29 |
+#include "../../db/db_con.h" |
|
30 |
+#include "../../db/db_res.h" |
|
31 |
+#include "../../db/db_row.h" |
|
32 |
+ |
|
33 |
+ |
|
34 |
+/* |
|
35 |
+ * Convert a row from result into db API representation |
|
36 |
+ */ |
|
37 |
+int db_mysql_convert_row(const db_con_t* _h, db_res_t* _res, db_row_t* _r); |
|
38 |
+ |
|
39 |
+#endif /* ROW_H */ |