diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-11 18:28:36 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-11 18:28:36 +0100 |
| commit | a656e3eb1840c0637ab0eb1f5eba24071cc46ba8 (patch) | |
| tree | 28204164508ce53969a8954b93518a7192344649 /libmsi/libmsi-record.c | |
| parent | 015c0a4597d61f4ebb31fb566205f24ef89cb2b7 (diff) | |
| parent | f0e95298b10bad066e895928e0e917dc543471cc (diff) | |
| download | msitools-a656e3eb1840c0637ab0eb1f5eba24071cc46ba8.tar.gz msitools-a656e3eb1840c0637ab0eb1f5eba24071cc46ba8.tar.xz msitools-a656e3eb1840c0637ab0eb1f5eba24071cc46ba8.zip | |
Merge branch 'pre-gsf'
Conflicts:
libmsi/table.c
Diffstat (limited to 'libmsi/libmsi-record.c')
| -rw-r--r-- | libmsi/libmsi-record.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libmsi/libmsi-record.c b/libmsi/libmsi-record.c index 848ba61..9390c03 100644 --- a/libmsi/libmsi-record.c +++ b/libmsi/libmsi-record.c @@ -219,10 +219,10 @@ int libmsi_record_get_integer( const LibmsiRecord *rec, unsigned iField) TRACE("%p %d\n", rec, iField ); if( !rec ) - return MSI_NULL_INTEGER; + return LIBMSI_NULL_INT; if( iField > rec->count ) - return MSI_NULL_INTEGER; + return LIBMSI_NULL_INT; switch( rec->fields[iField].type ) { @@ -231,12 +231,12 @@ int libmsi_record_get_integer( const LibmsiRecord *rec, unsigned iField) case LIBMSI_FIELD_TYPE_STR: if( expr_int_from_string( rec->fields[iField].u.szVal, &ret ) ) return ret; - return MSI_NULL_INTEGER; + return LIBMSI_NULL_INT; default: break; } - return MSI_NULL_INTEGER; + return LIBMSI_NULL_INT; } LibmsiResult libmsi_record_clear_data( LibmsiRecord *rec ) |