projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[kdbus] Add SipHash algorithm
[platform/upstream/glib.git]
/
glib
/
gvarianttypeinfo.c
diff --git
a/glib/gvarianttypeinfo.c
b/glib/gvarianttypeinfo.c
index
0c380ce
..
48d25df
100644
(file)
--- a/
glib/gvarianttypeinfo.c
+++ b/
glib/gvarianttypeinfo.c
@@
-13,9
+13,7
@@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
*
* Author: Ryan Lortie <desrt@desrt.ca>
*/
*
* Author: Ryan Lortie <desrt@desrt.ca>
*/
@@
-117,7
+115,7
@@
static const GVariantTypeInfo g_variant_type_info_basic_table[24] = {
/* 'c' */ { not_a_type },
/* 'd' */ { fixed_aligned(8) }, /* double */
/* 'e' */ { not_a_type },
/* 'c' */ { not_a_type },
/* 'd' */ { fixed_aligned(8) }, /* double */
/* 'e' */ { not_a_type },
- /* 'f' */ {
not_a_type },
+ /* 'f' */ {
fixed_aligned(4) }, /* float */
/* 'g' */ { unaligned }, /* signature string */
/* 'h' */ { fixed_aligned(4) }, /* file handle (int32) */
/* 'i' */ { fixed_aligned(4) }, /* int32 */
/* 'g' */ { unaligned }, /* signature string */
/* 'h' */ { fixed_aligned(4) }, /* file handle (int32) */
/* 'i' */ { fixed_aligned(4) }, /* int32 */
@@
-149,7
+147,7
@@
static const GVariantTypeInfo g_variant_type_info_basic_table[24] = {
* GVariantTypeInfo itself, we save a bunch of relocations.
*/
static const char g_variant_type_info_basic_chars[24][2] = {
* GVariantTypeInfo itself, we save a bunch of relocations.
*/
static const char g_variant_type_info_basic_chars[24][2] = {
- "b", " ", "d", " ", "
", "g", "h", "i", " ", " ", " ", " ",
+ "b", " ", "d", " ", "
f
", "g", "h", "i", " ", " ", " ", " ",
"n", "o", " ", "q", " ", "s", "t", "u", "v", " ", "x", "y"
};
"n", "o", " ", "q", " ", "s", "t", "u", "v", " ", "x", "y"
};
@@
-222,8
+220,8
@@
g_variant_type_info_get_type_string (GVariantTypeInfo *info)
/* < private >
* g_variant_type_info_query:
* @info: a #GVariantTypeInfo
/* < private >
* g_variant_type_info_query:
* @info: a #GVariantTypeInfo
- * @alignment: the location to store the alignment, or %NULL
- * @fixed_size: the location to store the fixed size, or %NULL
+ * @alignment:
(allow-none):
the location to store the alignment, or %NULL
+ * @fixed_size:
(allow-none):
the location to store the fixed size, or %NULL
*
* Queries @info to determine the alignment requirements and fixed size
* (if any) of the type.
*
* Queries @info to determine the alignment requirements and fixed size
* (if any) of the type.
@@
-306,8
+304,8
@@
g_variant_type_info_element (GVariantTypeInfo *info)
/* < private >
* g_variant_type_query_element:
* @info: a #GVariantTypeInfo for an array or maybe type
/* < private >
* g_variant_type_query_element:
* @info: a #GVariantTypeInfo for an array or maybe type
- * @alignment: the location to store the alignment, or %NULL
- * @fixed_size: the location to store the fixed size, or %NULL
+ * @alignment:
(allow-none):
the location to store the alignment, or %NULL
+ * @fixed_size:
(allow-none):
the location to store the fixed size, or %NULL
*
* Returns the alignment requires and fixed size (if any) for the
* element type of the array. This call is a convenience wrapper around
*
* Returns the alignment requires and fixed size (if any) for the
* element type of the array. This call is a convenience wrapper around