Add NewXPBWriterFromTag to have cleaner code

backup_manager.go

@@ -94,7 +94,7 @@ func (bm *BackupManager) Backup(database string, backup string, options BackupOp
 		optionsMask |= isc_spb_bkp_expand
 	}
 
-	spb := NewXPBWriterFromBuffer([]byte{isc_action_svc_backup})
+	spb := NewXPBWriterFromTag(isc_action_svc_backup)
 	spb.PutString(isc_spb_dbname, database)
 	spb.PutString(isc_spb_bkp_file, backup)
 	spb.PutInt32(isc_spb_options, optionsMask)
@@ -146,7 +146,7 @@ func (bm *BackupManager) Restore(backup string, database string, options Restore
 		optionsMask |= isc_spb_res_use_all_space
 	}
 
-	spb := NewXPBWriterFromBuffer([]byte{isc_action_svc_restore})
+	spb := NewXPBWriterFromTag(isc_action_svc_restore)
 	spb.PutString(isc_spb_dbname, database)
 	spb.PutString(isc_spb_bkp_file, backup)
 	spb.PutInt32(isc_spb_options, optionsMask)

nbackup_manager.go

@@ -48,7 +48,7 @@ func NewNBackupManager(addr string, user string, password string, options Servic
 }
 
 func (bm *NBackupManager) Backup(database string, backup string, options NBackupOptions, verbose chan string) error {
-	spb := NewXPBWriterFromBuffer([]byte{isc_action_svc_nbak})
+	spb := NewXPBWriterFromTag(isc_action_svc_nbak)
 	spb.PutString(isc_spb_dbname, database)
 	spb.PutString(isc_spb_nbk_file, backup)
 
@@ -70,7 +70,7 @@ func (bm *NBackupManager) Backup(database string, backup string, options NBackup
 }
 
 func (bm *NBackupManager) Restore(backup string, database string, options NBackupOptions, verbose chan string) error {
-	spb := NewXPBWriterFromBuffer([]byte{isc_action_svc_nrest})
+	spb := NewXPBWriterFromTag(isc_action_svc_nrest)
 	spb.PutString(isc_spb_dbname, database)
 	spb.PutString(isc_spb_nbk_file, backup)
 
@@ -83,7 +83,7 @@ func (bm *NBackupManager) Restore(backup string, database string, options NBacku
 }
 
 func (bm *NBackupManager) Fixup(database string, options NBackupOptions, verbose chan string) error {
-	spb := NewXPBWriterFromBuffer([]byte{isc_action_svc_nfix})
+	spb := NewXPBWriterFromTag(isc_action_svc_nfix)
 	spb.PutString(isc_spb_dbname, database)
 
 	optionsMask := options.GetOptionsMask()

service_manager.go

@@ -380,7 +380,7 @@ func (svc *ServiceManager) doGetDbStats(database string, options StatisticsOptio
 		optMask |= isc_spb_sts_table
 	}
 
-	spb := NewXPBWriterFromBuffer([]byte{isc_action_svc_db_stats})
+	spb := NewXPBWriterFromTag(isc_action_svc_db_stats)
 	spb.PutString(isc_spb_dbname, database)
 	spb.PutInt32(isc_spb_options, optMask)
 

trace_manager.go

@@ -47,7 +47,7 @@ func (t *TraceManager) StartWithName(name string, config string) (*TraceSession,
 	}
 
 	var res string
-	var spb = NewXPBWriterFromBuffer([]byte{isc_action_svc_trace_start})
+	var spb = NewXPBWriterFromTag(isc_action_svc_trace_start)
 
 	if len(name) > 0 {
 		spb.PutString(isc_spb_trc_name, name)
@@ -134,7 +134,7 @@ func (ts *TraceSession) Stop() (err error) {
 	}(auxConn)
 
 	var res string
-	spb := NewXPBWriterFromBuffer([]byte{isc_action_svc_trace_stop})
+	spb := NewXPBWriterFromTag(isc_action_svc_trace_stop)
 	spb.PutInt32(isc_spb_trc_id, ts.id)
 
 	if err = auxConn.ServiceStart(spb.GetBuffer()); err != nil {
@@ -166,7 +166,7 @@ func (ts *TraceSession) Pause() (err error) {
 	}(auxConn)
 
 	var res string
-	spb := NewXPBWriterFromBuffer([]byte{isc_action_svc_trace_suspend})
+	spb := NewXPBWriterFromTag(isc_action_svc_trace_suspend)
 	spb.PutInt32(isc_spb_trc_id, ts.id)
 
 	if err = auxConn.ServiceStart(spb.GetBuffer()); err != nil {
@@ -198,7 +198,7 @@ func (ts *TraceSession) Resume() (err error) {
 	}(auxConn)
 
 	var res string
-	spb := NewXPBWriterFromBuffer([]byte{isc_action_svc_trace_resume})
+	spb := NewXPBWriterFromTag(isc_action_svc_trace_resume)
 	spb.PutInt32(isc_spb_trc_id, ts.id)
 
 	if err = auxConn.ServiceStart(spb.GetBuffer()); err != nil {

user_manager.go

@@ -132,7 +132,7 @@ func (um *UserManager) Close() error {
 }
 
 func (um *UserManager) userAction(action byte, user *User) error {
-	spb := NewXPBWriterFromBuffer([]byte{action})
+	spb := NewXPBWriterFromTag(action)
 	if user != nil {
 		spb.PutBytes(user.GetSpb())
 	}

xpb.go

@@ -56,6 +56,10 @@ func NewXPBWriter() *XPBWriter {
 	return &XPBWriter{}
 }
 
+func NewXPBWriterFromTag(tag byte) *XPBWriter {
+	return &XPBWriter{buf: []byte{tag}}
+}
+
 func NewXPBWriterFromBuffer(buf []byte) *XPBWriter {
 	return &XPBWriter{buf: buf}
 }